Diff for /gforth/prims2x.fs between versions 1.25 and 1.48

version 1.25, 1997/02/06 21:23:05 version 1.48, 2000/09/23 15:46:58
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,2000 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 16 Line 16
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
   
 \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)  \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)
Line 42 Line 42
   
 warnings off  warnings off
   
 include extend.fs  [IFUNDEF] vocabulary    \ we are executed just with kernel image
                           \ load the rest that is needed
                           \ (require fails because this file is needed from a
                           \ different directory with the wordlibraries)
   include ./search.fs                     
   include ./extend.fs
   [THEN]
   
   [IFUNDEF] environment?
   include ./environ.fs
   [THEN]
   
 \ require interpretation.fs  include ./gray.fs
 require debugging.fs  
 [IFUNDEF] vocabulary    include search-order.fs [THEN]  
 [IFUNDEF] environment?  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
 #tab constant tab-char  #tab constant tab-char
 #lf constant nl-char  #lf constant nl-char
   
 : read-whole-file ( c-addr1 file-id -- c-addr2 )  
 \ 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  
   >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)
 variable cookedinput \ pointer to the next char to be parsed  variable cookedinput \ pointer to the next char to be parsed
Line 121  variable name-line Line 122  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 212  print-token ! Line 214  print-token !
   
 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
 bl singleton                                            charclass blank  bl singleton tab-char over add-member                   charclass white
 tab-char singleton                                      charclass tab  
 nl-char singleton eof-char over add-member complement   charclass nonl  nl-char singleton eof-char over add-member complement   charclass nonl
 nl-char singleton eof-char over add-member char : over add-member complement  charclass nocolonnl  nl-char singleton eof-char over add-member
 bl 1+ maxchar ..                                        charclass nowhite      char : over add-member complement                   charclass nocolonnl
   bl 1+ maxchar .. char \ singleton complement intersection
                                                           charclass nowhitebq
   bl 1+ maxchar ..                                        charclass nowhite
 char " singleton eof-char over add-member complement    charclass noquote  char " singleton eof-char over add-member complement    charclass noquote
 nl-char singleton                                       charclass nl  nl-char singleton                                       charclass nl
 eof-char singleton                                      charclass eof  eof-char singleton                                      charclass eof
Line 225  eof-char singleton     charclass eof Line 229  eof-char singleton     charclass eof
 (( letter (( letter || digit )) **  (( letter (( letter || digit )) **
 )) <- c-name ( -- )  )) <- c-name ( -- )
   
 nowhite ++  (( nowhitebq nowhite ** ))
 <- name ( -- )  <- name ( -- )
   
 (( {{ start }} ` \ nonl ** nl {{ end  Variable forth-flag
       2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}  Variable c-flag
 )) <- comment ( -- )  
   (( (( ` f || ` F )) {{ start }} nonl ** 
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}     {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
    ` - ` - blank **  )) <- forth-comment ( -- )
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}  
   (( (( ` c || ` C )) {{ start }} nonl ** 
      {{ end c-flag @ IF type cr ELSE 2drop THEN }}
   )) <- c-comment ( -- )
   
   (( ` - nonl ** {{ 
           forth-flag @ IF ." [ELSE]" cr THEN
           c-flag @ IF ." #else" cr THEN }}
   )) <- else-comment
   
   (( ` + {{ start }} nonl ** {{ end
           dup
           IF      c-flag @
                   IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
                   THEN
                   forth-flag @
                   IF  ." has? " type ."  [IF]"  cr THEN
           ELSE    2drop
               c-flag @      IF  ." #endif"  cr THEN
               forth-flag @  IF  ." [THEN]"  cr THEN
           THEN }}
   )) <- if-comment
   
   (( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
   
   (( ` \ comment-body nl )) <- comment ( -- )
   
   (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-in-end ! }}
      ` - ` - white **
      {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- stack-effect ( -- )
   
 (( {{ s" " doc 2! s" " forth-code 2! }}  (( {{ s" " doc 2! s" " forth-code 2! }}
    (( comment || nl )) **  
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}     (( {{ line @ name-line ! filename 2@ name-filename 2! }}
       {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++        {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  white ++
       {{ start }} stack-effect {{ end stack-string 2! }} tab ++        ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
         {{ start }} name {{ end wordset 2! }} tab **          {{ start }} name {{ end wordset 2! }} white **
         (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl          (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
    ))     ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}
    (( ` :  nl     (( ` :  nl
       {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
    )) ??     )) ?? {{ printprim }}
    (( nl || eof ))     (( nl || eof ))
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( primitive {{ printprim }} )) **  eof ))  (( (( comment || primitive || nl )) ** eof ))
 parser primitives2something  parser primitives2something
 warnings @ [IF]  warnings @ [IF]
 .( parser generated ok ) cr  .( parser generated ok ) cr
Line 263  warnings @ [IF] Line 295  warnings @ [IF]
 \ fileid is for the input file, xt ( -- ) is for the output word  \ fileid is for the input file, xt ( -- ) is for the output word
  output !   output !
  here dup rawinput ! cookedinput !   here dup rawinput ! cookedinput !
  here swap read-whole-file   here unused rot read-file throw
  dup endrawinput !   dup here + endrawinput !
  here - allot   allot
  align   align
  checksyncline   checksyncline
 \ begin  \ begin
Line 344  constant type-description Line 376  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 354  constant type-description Line 390  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 453  s" DFloat *" single-type starts-with df_ Line 489  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 573  set-current Line 609  set-current
    i item-name 2@ type space     i item-name 2@ type space
  item-descr +loop ;    item-descr +loop ; 
   
 : output-c ( -- )  : output-c ( -- ) 
  ." 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
  ." {" cr   ." {" cr
Line 597  set-current Line 633  set-current
  cr   cr
 ;  ;
   
 : output-label ( -- )  : dstack-used?
  ." &&I_" c-name 2@ type ." ," cr ;    effect-in-size 2@ drop
     effect-out-size 2@ drop max 0<> ;
 : output-alias ( -- )  
  f-comment 2@ nip  : fstack-used?
  IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN    effect-in-size 2@ nip
  primitive-number @ . ." alias " forth-name 2@ type cr    effect-out-size 2@ nip max 0<> ;
  -1 primitive-number +! ;  
   : output-funclabel ( -- )
 : output-forth ( -- )    1 function-number +!
  f-comment 2@ 2 min s" \+" compare 0=    ." &I_" c-name 2@ type ." ," cr ;
  IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN  
  forth-code @ 0=  : output-forthname ( -- )
  IF    output-alias    1 function-number +!
  ELSE  ." : " forth-name 2@ type ."   ( "    '" emit forth-name 2@ type '" emit ." ," cr ;
        effect-in effect-in-end @ .stack-list ." -- "  
        effect-out effect-out-end @ .stack-list ." )" cr  : output-c-func ( -- )
        forth-code 2@ type cr  \ used for word libraries
        -1 primitive-number +!      1 function-number +!
  THEN ;      ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
       ."  ( " stack-string 2@ type ."  ) */" cr
       ." /* " doc 2@ type ."  */" cr
       ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
       \ debugging
       ." {" cr
       declarations
       compute-offsets \ for everything else
       dstack-used? IF ." Cell *sp=SP;" cr THEN
       fstack-used? IF ." Cell *fp=*FP;" cr THEN
       flush-tos
       fetches
       stack-pointer-updates
       fstack-used? IF ." *FP=fp;" cr THEN
       ." {" cr
       ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
       c-code 2@ type
       ." }" cr
       stores
       fill-tos
       ." return (sp);" cr
       ." }" cr
       cr ;
   
   : output-label ( -- )  
       ." (Label)&&I_" c-name 2@ type ." ," cr
       -1 primitive-number +! ;
   
   : output-alias ( -- ) 
       ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
       -1 primitive-number +! ;
   
   : output-forth ( -- )  
       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 650  set-current Line 728  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.25  
changed lines
  Added in v.1.48


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