Diff for /gforth/prims2x.fs between versions 1.17 and 1.49

version 1.17, 1995/12/23 16:21:59 version 1.49, 2000/11/10 10:04:20
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
   
 [IFUNDEF] vocabulary    include search-order.fs [THEN]  [IFUNDEF] vocabulary    \ we are executed just with kernel image
 [IFUNDEF] environment?  include environ.fs      [THEN]                          \ load the rest that is needed
 include gray.fs                          \ (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]
   
   : struct% struct ; \ struct is redefined in gray
   
   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
 4096 constant batch-size \ no meaning, just make sure it's >0  
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  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 )  variable rawinput \ pointer to next character to be scanned
 \ reads the contents of the file file-id puts it into memory at c-addr1  variable endrawinput \ pointer to the end of the input (the char after the last)
 \ c-addr2 is the first address after the file block  variable cookedinput \ pointer to the next char to be parsed
   begin ( c-addr file-id )  
     2dup batch-size swap read-file   
     if  
       true abort" I/O error"  
     endif  
     ( c-addr file-id actual-size ) rot over + -rot  
     batch-size <>  
   until  
   drop ;  
   
 variable input \ pointer to next character to be parsed  
 variable endinput \ pointer to the end of the input (the char after the last)  
 variable line \ line number of char pointed to by input  variable line \ line number of char pointed to by input
 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 
 \ !! unfortunately, this does not mean that they do not appear in the  
 \ output. This could be changed by copying the input (skipping  
 \ synclines) in ?nextchar  
   
 : start ( -- addr )  : start ( -- addr )
  input @ ;   cookedinput @ ;
   
 : end ( addr -- addr u )  : end ( addr -- addr u )
  input @ over - ;   cookedinput @ over - ;
   
 variable output \ xt ( -- ) of output word  variable output \ xt ( -- ) of output word
   
 : printprim ( -- )  : printprim ( -- )
  output @ execute ;   output @ execute ;
   
 : field  \ stack types
  <builds-field ( n1 n2 -- n3 )  
  does>         ( addr1 -- addr2 )  struct%
    @ + ;      cell% 2* field stack-pointer \ stackpointer name
       cell% 2* field stack-cast \ cast string for assignments to stack elements
 : const-field      cell%    field stack-in  \ number of stack items in effect in
  <builds-field ( n1 n2 -- n3 )      cell%    field stack-out \ number of stack items in effect out
  does>         ( addr -- w )  end-struct stack%
    @ + @ ;  
   : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
 struct      create stack% %allot >r
  2 cells field item-name      save-mem r@ stack-cast 2!
  cell field item-d-offset      save-mem r> stack-pointer 2! ;
  cell field item-f-offset  
  cell field item-type  s" sp" save-mem s" (Cell)" make-stack data-stack 
 constant item-descr  s" fp" save-mem s" "       make-stack fp-stack
   \ !! initialize stack-in and stack-out
   
   \ stack items
   
   struct%
    cell% 2* field item-name   \ name, excluding stack prefixes
    cell%    field item-stack  \ descriptor for the stack used, 0 is default
    cell%    field item-type   \ descriptor for the item type
    cell%    field item-offset \ offset in stack items, 0 for the deepest element
   end-struct item%
   
   : init-item ( addr u addr1 -- )
       \ initialize item at addr1 with name addr u
       \ !! remove stack prefix
       dup item% %size erase
       item-name 2! ;
   
   \ various variables for storing stuff of one primitive
   
 2variable forth-name  2variable forth-name
 2variable wordset  2variable wordset
Line 113  constant item-descr Line 129  constant item-descr
 2variable c-code  2variable c-code
 2variable forth-code  2variable forth-code
 2variable stack-string  2variable stack-string
 create effect-in  max-effect item-descr * allot  create effect-in  max-effect item% %size * allot
 create effect-out max-effect item-descr * allot  create effect-out max-effect item% %size * allot
 variable effect-in-end ( pointer )  variable effect-in-end ( pointer )
 variable effect-out-end ( pointer )  variable effect-out-end ( pointer )
 2variable effect-in-size  
 2variable effect-out-size  
 variable c-line  variable c-line
 2variable c-filename  2variable c-filename
 variable name-line  variable name-line
Line 126  variable name-line Line 140  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 145  variable items Line 160  variable items
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
   
 : getinput ( -- n )  : getinput ( -- n )
  input @   rawinput @ endrawinput @ =
  dup endinput @ =  
  if   if
    drop eof-char     eof-char
  else   else
    c@     cookedinput @ c@
  endif ;   endif ;
   
 :noname ( n -- )  :noname ( n -- )
Line 168  print-token ! Line 182  print-token !
 : checksyncline ( -- )  : checksyncline ( -- )
     \ when input points to a newline, check if the next line is a      \ when input points to a newline, check if the next line is a
     \ sync line.  If it is, perform the appropriate actions.      \ sync line.  If it is, perform the appropriate actions.
     input @ >r      rawinput @ >r
     s" #line " r@ over compare 0<> if      s" #line " r@ over compare 0<> if
         rdrop 1 line +! EXIT          rdrop 1 line +! EXIT
     endif      endif
     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 - 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"
     skipsynclines @ if      skipsynclines @ if
         dup char+ input !          dup char+ rawinput !
           rawinput @ c@ cookedinput @ c!
     endif      endif
     drop ;      drop ;
   
 : ?nextchar ( f -- )  : ?nextchar ( f -- )
     ?not? if      ?not? if
         ." syntax error" cr          filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
         getinput . cr          getinput . cr
         input @ endinput @ over - 100 min type cr          rawinput @ endrawinput @ over - 100 min type cr
         abort          abort
     endif      endif
     input @ endinput @ <> if      rawinput @ endrawinput @ <> if
         input @ c@          rawinput @ c@
         1 input +!          1 chars rawinput +!
           1 chars cookedinput +!
         nl-char = if          nl-char = if
             checksyncline              checksyncline
         endif          endif
           rawinput @ c@ cookedinput @ c!
     endif ;      endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
Line 211  print-token ! Line 228  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
 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 228  eof-char singleton     charclass eof Line 247  eof-char singleton     charclass eof
 (( letter (( letter || digit )) **  (( letter (( letter || digit )) **
 )) <- c-name ( -- )  )) <- c-name ( -- )
   
 nowhite ++  (( nowhitebq nowhite ** ))
 <- name ( -- )  <- name ( -- )
   
 (( ` \ nonl ** nl  Variable forth-flag
 )) <- comment ( -- )  Variable c-flag
   
 \ (( ` # ` l ` i ` n ` e blank  (( (( ` f || ` F )) {{ start }} nonl ** 
 \ {{ 0. start }} digit ++ {{ end >number abort" line number?" drop drop 1- line ! }} blank     {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
 \    (( ` " {{ start }} noquote ++ {{ end filename 2! }} `" )) ??  )) <- forth-comment ( -- )
 \    nl  
 \ )) <- syncline ( -- )  (( (( ` c || ` C )) {{ start }} nonl ** 
      {{ end c-flag @ IF type cr ELSE 2drop THEN }}
 \ (( nl syncline ?? )) <- nlsync  )) <- c-comment ( -- )
   
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}  (( ` - nonl ** {{ 
    ` - ` - blank **          forth-flag @ IF ." [ELSE]" cr THEN
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}          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 init-item item% %size + }} white ** )) ** {{ effect-in-end ! }}
      ` - ` - white **
      {{ effect-out }} (( {{ start }} c-name {{ end 2 pick init-item item% %size + }} 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 )) ??
    {{ line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! }}     {{ 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 272  warnings @ [IF] Line 312  warnings @ [IF]
 : primfilter ( file-id xt -- )  : primfilter ( file-id xt -- )
 \ 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 input !   here dup rawinput ! cookedinput !
  here swap read-whole-file   here unused rot read-file throw
  dup endinput !   dup here + endrawinput !
  here - allot   allot
  align   align
  checksyncline   checksyncline
   \ begin
   \     getinput dup eof-char = ?EXIT emit true ?nextchar
   \ again ;
  primitives2something ;   primitives2something ;
   
 \ types  \ types
   
 struct  struct%
  2 cells field type-c-name      cell% 2* field type-c-name
  cell const-field type-d-size      cell%    field type-stack \ default stack
  cell const-field type-f-size      cell%    field type-size  \ size of type in stack items
  cell const-field type-fetch-handler      cell%    field type-fetch \ xt of fetch code generator ( item -- )
  cell const-field type-store-handler      cell%    field type-store \ xt of store code generator ( item -- )
 constant type-description  end-struct type%
   
 : data-stack-access ( n1 n2 n3 -- )  : stack-access ( n stack -- )
 \ n1 is the offset of the accessed item, n2, n3 are effect-*-size      \ print a stack access at index n of stack
  drop swap - 1- dup      stack-pointer 2@ type
  if      dup
    ." sp[" 0 .r ." ]"      if
  else          ." [" 0 .r ." ]"
    drop ." TOS"      else
  endif ;          drop ." TOS"
       endif ;
   
 : fp-stack-access ( n1 n2 n3 -- )  : item-in-index ( item -- n )
 \ n1 is the offset of the accessed item, n2, n3 are effect-*-size      \ n is the index of item (in the in-effect)
  nip swap - 1- dup      >r r@ item-stack @ stack-in @ r> item-offset @ - 1- ;
  if  
    ." fp[" 0 .r ." ]"  
  else  
    drop ." FTOS"  
  endif ;  
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
    \ fetch a single stack item from its stack
  >r   >r
  r@ item-name 2@ type   r@ item-name 2@ type
  ."  = ("    ."  = (" 
  r@ item-type @ type-c-name 2@ type ." ) "   r@ item-type @ type-c-name 2@ type ." ) "
  r@ item-d-offset @ effect-in-size 2@ data-stack-access ." ;" cr   r@ item-in-index r@ item-stack @ stack-access
    ." ;" cr
  rdrop ;    rdrop ; 
   
 : fetch-double ( item -- )  : fetch-double ( item -- )
    \ fetch a double stack item from its stack
  >r   >r
  r@ item-name 2@ type    ." FETCH_DCELL("
  ." = ({Double_Store _d; _d.cells.low = "   r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access   r@ item-in-index r@ item-stack @ 2dup stack-access
  ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access   ." , "                      -1 under+ stack-access
  ." ; _d.dcell;});" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : fetch-float ( item -- )  : same-as-in? ( item -- f )
  >r   \ f is true iff the offset and stack of item is the same as on input
  r@ item-name 2@ type  
  ."  = "  
  \ ." (" r@ item-type @ type-c-name 2@ type ." ) "  
  r@ item-f-offset @ effect-in-size 2@ fp-stack-access ." ;" cr  
  rdrop ;  
   
 : d-same-as-in? ( item -- f )  
 \ f is true iff the offset of item is the same as on input  
  >r   >r
  r@ item-name 2@ items @ search-wordlist 0=   r@ item-name 2@ items @ search-wordlist 0=
  abort" bug"   abort" bug"
Line 343  constant type-description Line 377  constant type-description
  if \ item first appeared in output   if \ item first appeared in output
    drop false     drop false
  else   else
    item-d-offset @ r@ item-d-offset @ =     dup  item-stack  @ r@ item-stack  @ = 
      swap item-offset @ r@ item-offset @ = and
  endif   endif
  rdrop ;   rdrop ;
   
 : is-in-tos? ( item -- f )  : item-out-index ( item -- n )
 \ true if item has the same offset as the input TOS      \ n is the index of item (in the in-effect)
  item-d-offset @ 1+ effect-in-size 2@ drop = ;      >r r@ item-stack @ stack-out @ r> item-offset @ - 1- ;
   
 : really-store-single ( item -- )  : really-store-single ( item -- )
  >r   >r
  r@ item-d-offset @ effect-out-size 2@ data-stack-access ."  = (Cell)"   r@ item-out-index r@ item-stack @ stack-access ."  = "
    r@ item-stack @ stack-cast 2@ type
  r@ item-name 2@ type ." ;"   r@ item-name 2@ type ." ;"
  rdrop ;   rdrop ;
   
 : store-single ( item -- )  : store-single ( item -- )
  >r   >r
  r@ d-same-as-in?   r@ same-as-in?
  if   if
    r@ is-in-tos?     r@ item-in-index 0= r@ item-out-index 0= xor
    if     if
      ." IF_TOS(" r@ really-store-single ." );" cr         ." IF_" r@ item-stack @ stack-pointer 2@ type
          ." TOS(" r@ really-store-single ." );" cr
    endif     endif
  else   else
    r@ really-store-single cr     r@ really-store-single cr
Line 373  constant type-description Line 410  constant type-description
 : store-double ( item -- )  : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed  \ !! store optimization is not performed, because it is not yet needed
  >r   >r
  ." {Double_Store _d; _d.dcell = " r@ item-name 2@ type ." ; "   ." STORE_DCELL(" r@ item-name 2@ type ." , "
  r@ item-d-offset @ dup    effect-out-size 2@ data-stack-access    r@ item-out-index r@ item-stack @ 2dup stack-access
  ."  = _d.cells.low; " 1+ effect-out-size 2@ data-stack-access   ." , "                       -1 under+ stack-access
  ." = _d.cells.high;}" cr   ." );" cr
  rdrop ;   rdrop ;
   
 : f-same-as-in? ( item -- f )  
 \ f is true iff the offset of item is the same as on input  
  >r  
  r@ item-name 2@ items @ search-wordlist 0=  
  abort" bug"  
  execute @  
  dup r@ =  
  if \ item first appeared in output  
    drop false  
  else  
    item-f-offset @ r@ item-f-offset @ =  
  endif  
  rdrop ;  
   
 : is-in-ftos? ( item -- f )  : single-type ( -- xt1 xt2 n stack )
 \ true if item has the same offset as the input TOS   ['] fetch-single ['] store-single 1 data-stack ;
  item-f-offset @ 1+ effect-in-size 2@ nip = ;  
   
 : really-store-float ( item -- )  : double-type ( -- xt1 xt2 n stack )
  >r   ['] fetch-double ['] store-double 2 data-stack ;
  r@ item-f-offset @ effect-out-size 2@ fp-stack-access ."  = "  
  r@ item-name 2@ type ." ;"  
  rdrop ;  
   
 : store-float ( item -- )  : float-type ( -- xt1 xt2 n stack )
  >r   ['] fetch-single ['] store-single 1 fp-stack ;
  r@ f-same-as-in?  
  if  
    r@ is-in-ftos?  
    if  
      ." IF_FTOS(" r@ really-store-float ." );" cr  
    endif  
  else  
    r@ really-store-float cr  
  endif  
  rdrop ;  
    
 : single-type ( -- xt1 xt2 n1 n2 )  
  ['] fetch-single ['] store-single 1 0 ;  
   
 : double-type ( -- xt1 xt2 n1 n2 )  
  ['] fetch-double ['] store-double 2 0 ;  
   
 : float-type ( -- xt1 xt2 n1 n2 )  
  ['] fetch-float ['] store-float 0 1 ;  
   
 : s, ( addr u -- )  : s, ( addr u -- )
 \ allocate a string  \ allocate a string
  here swap dup allot move ;   here swap dup allot move ;
   
 : starts-with ( addr u xt1 xt2 n1 n2 "prefix" -- )  : starts-with { addr u xt1 xt2 n stack -- } ( "prefix" -- )
 \ describes a type      \ describes a type
 \ addr u specifies the C type name      \ addr u specifies the C type name
 \ n1 is the size of the type on the data stack      \ stack effect entries of the type start with prefix
 \ n2 is the size of the type on the FP stack      create type% %allot >r
 \ stack effect entries of the type start with prefix      addr u save-mem r@ type-c-name 2!
  >r >r >r >r      xt1   r@ type-fetch !
  dup >r here >r s,      xt2   r@ type-store !
  create      n     r@ type-size !
  r> r> 2,      stack r@ type-stack !
  r> r> r> , r> , swap , , ;      rdrop ;
   
 wordlist constant types  wordlist constant types
 get-current  get-current
Line 460  s" DFloat *" single-type starts-with df_ Line 461  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 484  set-current Line 485  set-current
 : declaration ( item -- )  : declaration ( item -- )
  dup item-name 2@ items @ search-wordlist   dup item-name 2@ items @ search-wordlist
  if \ already declared ( item xt )   if \ already declared ( item xt )
    execute @ item-type @ swap item-type !       execute @ 2dup item-type @ swap item-type !
        item-stack @ swap item-stack ! \ !! does not generalize to stack prefixes
  else ( addr )   else ( addr )
    dup item-name 2@ nextname dup declare ( addr )     dup item-name 2@ nextname dup declare ( addr )
    dup >r item-name 2@ 2dup get-type ( addr1 u type-descr )     dup >r item-name 2@ 2dup get-type ( addr1 u type-descr )
      dup type-stack @ r@ item-stack ! \ !! only if item-stack @ 0=
    dup r> item-type ! ( addr1 u type-descr )     dup r> item-type ! ( addr1 u type-descr )
    type-c-name 2@ type space type ." ;" cr     type-c-name 2@ type space type ." ;" cr
  endif ;   endif ;
Line 495  set-current Line 498  set-current
 : declaration-list ( addr1 addr2 -- )  : declaration-list ( addr1 addr2 -- )
  swap ?do   swap ?do
   i declaration    i declaration
  item-descr +loop ;   item% %size +loop ;
   
 : fetch ( addr -- )  
  dup item-type @ type-fetch-handler execute ;  
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup items ! set-current
Line 509  set-current Line 509  set-current
 \ the leftmost (i.e. deepest) item has offset 0  \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset  \ the rightmost item has the highest offset
   
 : compute-offset ( n1 n2 item -- n3 n4 )  : compute-offset { item xt -- }
 \ n1, n3 are data-stack-offsets      \ xt specifies in/out; update stack-in/out and set item-offset
 \ n2, n4 are the fp-stack-offsets      item item-type @ type-size @
  >r      item item-stack @ xt execute dup @ >r +!
  swap dup r@ item-d-offset !      r> item item-offset ! ;
  r@ item-type @ type-d-size +  
  swap dup r@ item-f-offset !  : compute-list ( addr1 addr2 xt -- )
  r@ item-type @ type-f-size +      { xt }
  rdrop ;      swap u+do
           i xt compute-offset
       item% %size +loop ;
   
   : clear-stack { -- }
       dup stack-in off stack-out off ;
   
 : compute-list ( addr1 addr2 -- n1 n2 )  
 \ n1, n2 are the final offsets  
  0 0 2swap swap ?do  
   i compute-offset  
  item-descr +loop ;  
   
 : compute-offsets ( -- )  : compute-offsets ( -- )
  effect-in effect-in-end @ compute-list effect-in-size 2!      data-stack clear-stack  fp-stack clear-stack
  effect-out effect-out-end @ compute-list effect-out-size 2! ;      effect-in  effect-in-end  @ ['] stack-in  compute-list
       effect-out effect-out-end @ ['] stack-out compute-list ;
   
   : flush-a-tos { stack -- }
       stack stack-out @ 0<> stack stack-in @ 0= and
       if
           ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
           2dup type ." [0] = " type ." TOS);" cr
       endif ;
   
 : flush-tos ( -- )  : flush-tos ( -- )
  effect-in-size 2@ effect-out-size 2@      data-stack flush-a-tos
  0<> rot 0= and      fp-stack   flush-a-tos ;
  if  
    ." IF_FTOS(fp[0] = FTOS);" cr  : fill-a-tos { stack -- }
  endif      stack stack-out @ 0= stack stack-in @ 0<> and
  0<> swap 0= and      if
  if          ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
    ." IF_TOS(sp[0] = TOS);" cr          2dup type ." TOS = " type ." [0]);" cr
  endif ;      endif ;
   
 : fill-tos ( -- )  : fill-tos ( -- )
  effect-in-size 2@ effect-out-size 2@      fp-stack   fill-a-tos
  0= rot 0<> and      data-stack fill-a-tos ;
  if  
    ." IF_FTOS(FTOS = fp[0]);" cr  : fetch ( addr -- )
  endif   dup item-type @ type-fetch @ execute ;
  0= swap 0<> and  
  if  
    ." IF_TOS(TOS = sp[0]);" cr  
  endif ;  
   
 : fetches ( -- )  : fetches ( -- )
  effect-in-end @ effect-in ?do   effect-in-end @ effect-in ?do
    i fetch     i fetch
  item-descr +loop ;    item% %size +loop ; 
   
   : stack-pointer-update { stack -- }
       \ stack grow downwards
       stack stack-in @ stack stack-out @ -
       ?dup-if \ this check is not necessary, gcc would do this for us
           stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
       endif ;
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
 \ we need not check if an update is a noop; gcc does this for us      data-stack stack-pointer-update
  effect-in-size 2@      fp-stack   stack-pointer-update ;
  effect-out-size 2@  
  rot swap - ( d-in d-out f-diff )  
  rot rot - ( f-diff d-diff )  
  ?dup IF  ." sp += " 0 .r ." ;" cr  THEN  
  ?dup IF  ." fp += " 0 .r ." ;" cr  THEN ;  
   
 : store ( item -- )  : store ( item -- )
 \ f is true if the item should be stored  \ f is true if the item should be stored
 \ f is false if the store is probably not necessary  \ f is false if the store is probably not necessary
  dup item-type @ type-store-handler execute ;   dup item-type @ type-store @ execute ;
   
 : stores ( -- )  : stores ( -- )
  effect-out-end @ effect-out ?do   effect-out-end @ effect-out ?do
    i store     i store
  item-descr +loop ;    item% %size +loop ; 
   
 : .stack-list ( start end -- )  
  swap ?do  
    i item-name 2@ type space  
  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 604  set-current Line 605  set-current
  cr   cr
 ;  ;
   
 : output-label ( -- )  : stack-used? { stack -- f }
  ." &&I_" c-name 2@ type ." ," cr ;      stack stack-in @ stack stack-out @ or 0<> ;
   
 : output-alias ( -- )  : output-funclabel ( -- )
  primitive-number @ . ." alias " forth-name 2@ type cr    1 function-number +!
  -1 primitive-number +! ;    ." &I_" c-name 2@ type ." ," cr ;
   
 : output-forth ( -- )  : output-forthname ( -- )
  forth-code @ 0=    1 function-number +!
  IF    output-alias    '" emit forth-name 2@ type '" emit ." ," cr ;
  ELSE  ." : " forth-name 2@ type ."   ( "  
        effect-in effect-in-end @ .stack-list ." -- "  : output-c-func ( -- )
        effect-out effect-out-end @ .stack-list ." )" cr  \ used for word libraries
        forth-code 2@ type cr      1 function-number +!
        -1 primitive-number +!      ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
  THEN ;      ."  ( " 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
       data-stack stack-used? IF ." Cell *sp=SP;" cr THEN
       fp-stack   stack-used? IF ." Cell *fp=*FP;" cr THEN
       flush-tos
       fetches
       stack-pointer-updates
       fp-stack   stack-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 ."   ( "
           stack-string 2@ type ." )" 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 653  set-current Line 694  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.17  
changed lines
  Added in v.1.49


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