Diff for /gforth/prims2x.fs between versions 1.20 and 1.39

version 1.20, 1996/02/13 11:12:19 version 1.39, 1999/03/02 15:45:32
Line 1 Line 1
 \ converts primitives to, e.g., C code   \ converts primitives to, e.g., C code 
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 42 Line 42
   
 warnings off  warnings off
   
 require debugging.fs  [IFUNDEF] vocabulary    \ we are executed just with kernel image
 [IFUNDEF] vocabulary    include search-order.fs [THEN]                          \ load the rest that is needed
 [IFUNDEF] environment?  include environ.fs      [THEN]                          \ (require fails because this file is needed from a
 include gray.fs                          \ different directory with the wordlibraries)
   include ./search.fs                     
   include ./extend.fs
   include ./environ.fs
   [THEN]
   
   include ./gray.fs
   
 100 constant max-effect \ number of things on one side of a stack effect  100 constant max-effect \ number of things on one side of a stack effect
 255 constant maxchar  255 constant maxchar
Line 56  maxchar 1+ constant eof-char Line 62  maxchar 1+ constant eof-char
 : read-whole-file ( c-addr1 file-id -- c-addr2 )  : read-whole-file ( c-addr1 file-id -- c-addr2 )
 \ reads the contents of the file file-id puts it into memory at c-addr1  \ reads the contents of the file file-id puts it into memory at c-addr1
 \ c-addr2 is the first address after the file block  \ c-addr2 is the first address after the file block
   >r dup -1 r> read-file throw + ;    >r dup $7fffffff r> read-file throw + ;
   
 variable rawinput \ pointer to next character to be scanned  variable rawinput \ pointer to next character to be scanned
 variable endrawinput \ pointer to the end of the input (the char after the last)  variable endrawinput \ pointer to the end of the input (the char after the last)
Line 65  variable line \ line number of char poin Line 71  variable line \ line number of char poin
 1 line !  1 line !
 2variable filename \ filename of original input file  2variable filename \ filename of original input file
 0 0 filename 2!  0 0 filename 2!
   2variable f-comment
   0 0 f-comment 2!
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?  variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on   skipsynclines on 
   
   Variable flush-comment flush-comment off
   
   : ?flush-comment
       flush-comment @ 0= ?EXIT
       f-comment 2@ nip
       IF  cr f-comment 2@ 2 /string 1-
           dup IF
               2dup s" -" compare 0=
               IF
                   flush-comment @ 1 =
                   IF    ." #else"
                   ELSE  ." [ELSE]"  THEN
               ELSE
                   flush-comment @ 1 =
                   IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP
                   ELSE  ." has? " type ."  [IF]"  THEN
               THEN  cr
           ELSE    flush-comment @ 1 = IF  ." #endif"  ELSE  ." [THEN]"  THEN
               cr  THEN
           0 0 f-comment 2! THEN ;
   
 : start ( -- addr )  : start ( -- addr )
  cookedinput @ ;   cookedinput @ ;
   
Line 116  variable name-line Line 145  variable name-line
 2variable last-name-filename  2variable last-name-filename
   
 variable primitive-number -10 primitive-number !  variable primitive-number -10 primitive-number !
   Variable function-number 0 function-number !
   
 \ for several reasons stack items of a word are stored in a wordlist  \ for several reasons stack items of a word are stored in a wordlist
 \ since neither forget nor marker are implemented yet, we make a new  \ since neither forget nor marker are implemented yet, we make a new
Line 164  print-token ! Line 194  print-token !
     0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )      0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
     dup c@ bl = if      dup c@ bl = if
         char+ dup c@ [char] " <> abort" sync line syntax"          char+ dup c@ [char] " <> abort" sync line syntax"
         char+ dup 100 [char] " scan drop swap 2dup - save-string filename 2!          char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
         char+          char+
     endif      endif
     dup c@ nl-char <> abort" sync line syntax"      dup c@ nl-char <> abort" sync line syntax"
Line 203  print-token ! Line 233  print-token !
   
 : ` ( -- terminal ) ( use: ` c )  : ` ( -- terminal ) ( use: ` c )
  ( creates anonymous terminal for the character c )   ( creates anonymous terminal for the character c )
  [compile] ascii singleton ['] ?nextchar make-terminal ;   char singleton ['] ?nextchar make-terminal ;
   
 char a char z ..  char A char Z ..  union char _ singleton union  charclass letter  char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
 char 0 char 9 ..                                        charclass digit  char 0 char 9 ..                                        charclass digit
Line 223  eof-char singleton     charclass eof Line 253  eof-char singleton     charclass eof
 nowhite ++  nowhite ++
 <- name ( -- )  <- name ( -- )
   
 (( ` \ nonl ** nl  (( {{ ?flush-comment start }} ` \ nonl ** nl {{ end
         2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}
 )) <- comment ( -- )  )) <- comment ( -- )
   
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}  (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
Line 247  nowhite ++ Line 278  nowhite ++
    (( nl || eof ))     (( nl || eof ))
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( primitive {{ printprim }} )) **  eof ))  (( (( primitive {{ printprim }} )) ** eof ))
 parser primitives2something  parser primitives2something
 warnings @ [IF]  warnings @ [IF]
 .( parser generated ok ) cr  .( parser generated ok ) cr
Line 338  constant type-description Line 369  constant type-description
 \ true if item has the same offset as the input TOS  \ true if item has the same offset as the input TOS
  item-d-offset @ 1+ effect-in-size 2@ drop = ;   item-d-offset @ 1+ effect-in-size 2@ drop = ;
   
   : is-out-tos? ( item -- f )
   \ true if item has the same offset as the input TOS
    item-d-offset @ 1+ effect-out-size 2@ drop = ;
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
  >r   >r
  r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"   r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"
Line 348  constant type-description Line 383  constant type-description
  >r   >r
  r@ d-same-as-in?   r@ d-same-as-in?
  if   if
    r@ is-in-tos?     r@ is-in-tos? r@ is-out-tos? xor
    if     if
      ." IF_TOS(" r@ really-store-single ." );" cr       ." IF_TOS(" r@ really-store-single ." );" cr
    endif     endif
Line 447  s" DFloat *" single-type starts-with df_ Line 482  s" DFloat *" single-type starts-with df_
 s" SFloat *"    single-type starts-with sf_  s" SFloat *"    single-type starts-with sf_
 s" Xt"          single-type starts-with xt  s" Xt"          single-type starts-with xt
 s" WID"         single-type starts-with wid  s" WID"         single-type starts-with wid
 s" F83Name *"   single-type starts-with f83name  s" struct F83Name *"    single-type starts-with f83name
   
 set-current  set-current
   
Line 567  set-current Line 602  set-current
    i item-name 2@ type space     i item-name 2@ type space
  item-descr +loop ;    item-descr +loop ; 
   
 : output-c ( -- )  : output-c ( -- ) 1 flush-comment !
       ?flush-comment
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr   ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ."  ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " doc 2@ type ."  */" cr
  ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging   ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
Line 591  set-current Line 627  set-current
  cr   cr
 ;  ;
   
 : output-label ( -- )  : output-funclabel ( -- )
  ." &&I_" c-name 2@ type ." ," cr ;    1 function-number +!
     ." &I_" c-name 2@ type ." ," cr ;
 : output-alias ( -- )  
  primitive-number @ . ." alias " forth-name 2@ type cr  : output-forthname ( -- )
  -1 primitive-number +! ;    1 function-number +!
     '" emit forth-name 2@ type '" emit ." ," cr ;
 : output-forth ( -- )  
  forth-code @ 0=  : output-c-func ( -- )
  IF    output-alias      1 function-number +!
  ELSE  ." : " forth-name 2@ type ."   ( "      ." void I_" c-name 2@ type ." ()      /* " forth-name 2@ type
        effect-in effect-in-end @ .stack-list ." -- "      ."  ( " stack-string 2@ type ."  ) */" cr
        effect-out effect-out-end @ .stack-list ." )" cr      ." /* " doc 2@ type ."  */" cr
        forth-code 2@ type cr      ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
        -1 primitive-number +!      \ debugging
  THEN ;      ." {" cr
       ." DEF_CA" cr
       declarations
       compute-offsets \ for everything else
       ." NEXT_P0;" cr
       flush-tos
       fetches
       stack-pointer-updates
       ." {" cr
       ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
       c-code 2@ type
       ." }" cr
       ." NEXT_P1;" cr
       stores
       fill-tos
       ." NEXT_P2;" cr
       ." }" cr
       cr ;
   
   : output-label ( -- )  1 flush-comment !
       ?flush-comment
       ." (Label)&&I_" c-name 2@ type ." ," cr
       -1 primitive-number +! ;
   
   : output-alias ( -- )  flush-comment on
       ?flush-comment
       ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
       -1 primitive-number +! ;
   
   : output-forth ( -- )  flush-comment on
       ?flush-comment
       forth-code @ 0=
       IF          \ output-alias
           \ this is bad for ec: an alias is compiled if tho word does not exist!
           \ JAW
       ELSE  ." : " forth-name 2@ type ."   ( "
           effect-in effect-in-end @ .stack-list ." -- "
           effect-out effect-out-end @ .stack-list ." )" cr
           forth-code 2@ type cr
           -1 primitive-number +!
       THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
     name-filename 2@ last-name-filename 2@ compare if      name-filename 2@ last-name-filename 2@ compare if
Line 640  set-current Line 716  set-current
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
     >r      >r
     2dup filename 2!      2dup filename 2!
       0 function-number !
     r/o open-file abort" cannot open file"      r/o open-file abort" cannot open file"
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;      r> primfilter ;
   
   : process      ( xt -- )
       bl word count rot
       process-file ;

Removed from v.1.20  
changed lines
  Added in v.1.39


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>