Diff for /gforth/prims2x.fs between versions 1.30 and 1.42

version 1.30, 1998/05/02 21:28:43 version 1.42, 1999/05/10 12:50:49
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
   
 include search.fs  [IFUNDEF] vocabulary    \ we are executed just with kernel image
 include extend.fs                          \ 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 debugs.fs  
 [IFUNDEF] vocabulary    include search.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 57  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 77  skipsynclines on Line 77  skipsynclines on
 Variable flush-comment flush-comment off  Variable flush-comment flush-comment off
   
 : ?flush-comment  : ?flush-comment
  flush-comment @ 0= ?EXIT      flush-comment @ 0= ?EXIT
  f-comment 2@ nip      f-comment 2@ nip
  IF  cr f-comment 2@ 2 /string type 0 0 f-comment 2! THEN ;      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 237  eof-char singleton     charclass eof Line 251  eof-char singleton     charclass eof
 nowhite ++  nowhite ++
 <- name ( -- )  <- name ( -- )
   
 (( {{ ?flush-comment start }} ` \ nonl ** nl {{ end  Variable forth-flag
   Variable c-flag
   
   (( (( ` f || ` F )) {{ start }} nonl ** 
      {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
   )) <- forth-comment ( -- )
   
   (( (( ` c || ` C )) {{ start }} nonl ** 
      {{ end c-flag @ IF type cr ELSE 2drop THEN }}
   )) <- c-comment ( -- )
   
   (( (( forth-comment || c-comment )) ?? nonl ** )) <- comment-body
   
   (( {{ ?flush-comment start }} ` \ comment-body nl {{ end
       2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}        2dup 2 min s" \+" compare 0= IF  f-comment 2!  ELSE  2drop  THEN }}
 )) <- comment ( -- )  )) <- comment ( -- )
   
Line 262  nowhite ++ Line 289  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 272  warnings @ [IF] Line 299  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 353  constant type-description Line 380  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 363  constant type-description Line 394  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 462  s" DFloat *" single-type starts-with df_ Line 493  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 582  set-current Line 613  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 640  set-current Line 672  set-current
     ." }" cr      ." }" cr
     cr ;      cr ;
   
 : output-label ( -- )  : output-label ( -- )  1 flush-comment !
     ." &&I_" c-name 2@ type ." ," cr ;      ?flush-comment
       ." (Label)&&I_" c-name 2@ type ." ," cr
       -1 primitive-number +! ;
   
 : output-alias ( -- )  flush-comment on  : output-alias ( -- )  flush-comment on
  ?flush-comment      ?flush-comment
  primitive-number @ . ." alias " forth-name 2@ type cr      ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
  -1 primitive-number +! ;      -1 primitive-number +! ;
   
 : output-forth ( -- )  flush-comment on  : output-forth ( -- )  flush-comment on
     ?flush-comment      ?flush-comment
Line 702  set-current Line 736  set-current
 : process      ( xt -- )  : process      ( xt -- )
     bl word count rot      bl word count rot
     process-file ;      process-file ;
   

Removed from v.1.30  
changed lines
  Added in v.1.42


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