[gforth] / gforth / prims2x.fs  

gforth: gforth/prims2x.fs

Diff for /gforth/prims2x.fs between version 1.48 and 1.49

version 1.48, Sat Sep 23 15:46:58 2000 UTC version 1.49, Fri Nov 10 10:04:20 2000 UTC
Line 54 
Line 54 
 include ./environ.fs  include ./environ.fs
 [THEN]  [THEN]
   
   : struct% struct ; \ struct is redefined in gray
   
 include ./gray.fs  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
Line 85 
Line 87 
 : 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 109 
Line 129 
 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 265 
Line 283 
   
 (( ` \ comment-body nl )) <- comment ( -- )  (( ` \ comment-body nl )) <- comment ( -- )
   
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-in-end ! }}  (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick init-item item% %size + }} white ** )) ** {{ effect-in-end ! }}
    ` - ` - white **     ` - ` - white **
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} white ** )) ** {{ effect-out-end ! }}     {{ 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! }}
Line 307 
Line 325 
   
 \ 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
       dup
  if   if
    ." sp[" 0 .r ." ]"          ." [" 0 .r ." ]"
  else   else
    drop ." TOS"     drop ." TOS"
  endif ;   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
  ." FETCH_DCELL("   ." FETCH_DCELL("
  r@ item-name 2@ type ." , "   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
  ." , "                 1+ effect-in-size 2@ data-stack-access   ." , "                      -1 under+ stack-access
  ." );" 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 368 
Line 377 
  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- ;
   
 : 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-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@ is-out-tos? xor     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 403 
Line 411 
 \ !! store optimization is not performed, because it is not yet needed  \ !! store optimization is not performed, because it is not yet needed
  >r   >r
  ." STORE_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
  ." , "                 1+ effect-out-size 2@ data-stack-access   ." , "                       -1 under+ stack-access
  ." );" 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 )  
 \ true if item has the same offset as the input TOS  
  item-f-offset @ 1+ effect-in-size 2@ nip = ;  
   
 : really-store-float ( item -- )  
  >r  
  r@ item-f-offset @ effect-out-size 2@ fp-stack-access ."  = "  
  r@ item-name 2@ type ." ;"  
  rdrop ;  
   
 : store-float ( item -- )  
  >r  
  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 )  : single-type ( -- xt1 xt2 n stack )
  ['] fetch-single ['] store-single 1 0 ;   ['] fetch-single ['] store-single 1 data-stack ;
   
 : double-type ( -- xt1 xt2 n1 n2 )  : double-type ( -- xt1 xt2 n stack )
  ['] fetch-double ['] store-double 2 0 ;   ['] fetch-double ['] store-double 2 data-stack ;
   
 : float-type ( -- xt1 xt2 n1 n2 )  : float-type ( -- xt1 xt2 n stack )
  ['] fetch-float ['] store-float 0 1 ;   ['] fetch-single ['] store-single 1 fp-stack ;
   
 : 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  
 \ n2 is the size of the type on the FP stack  
 \ stack effect entries of the type start with prefix  \ stack effect entries of the type start with prefix
  >r >r >r >r      create type% %allot >r
  dup >r here >r s,      addr u save-mem r@ type-c-name 2!
  create      xt1   r@ type-fetch !
  r> r> 2,      xt2   r@ type-store !
  r> r> r> , r> , swap , , ;      n     r@ type-size !
       stack r@ type-stack !
       rdrop ;
   
 wordlist constant types  wordlist constant types
 get-current  get-current
Line 513 
Line 485 
 : 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 524 
Line 498 
 : 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 538 
Line 509 
 \ 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-tos ( -- )  : flush-a-tos { stack -- }
  effect-in-size 2@ effect-out-size 2@      stack stack-out @ 0<> stack stack-in @ 0= and
  0<> rot 0= and  
  if  
    ." IF_FTOS(fp[0] = FTOS);" cr  
  endif  
  0<> swap 0= and  
  if   if
    ." IF_TOS(sp[0] = TOS);" cr          ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
           2dup type ." [0] = " type ." TOS);" cr
  endif ;   endif ;
   
 : fill-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(FTOS = fp[0]);" cr  : fill-a-tos { stack -- }
  endif      stack stack-out @ 0= stack stack-in @ 0<> and
  0= swap 0<> and  
  if   if
    ." IF_TOS(TOS = sp[0]);" cr          ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
           2dup type ." TOS = " type ." [0]);" cr
  endif ;   endif ;
   
   : fill-tos ( -- )
       fp-stack   fill-a-tos
       data-stack fill-a-tos ;
   
   : fetch ( addr -- )
    dup item-type @ type-fetch @ execute ;
   
 : 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
Line 633 
Line 605 
  cr   cr
 ;  ;
   
 : dstack-used?  : stack-used? { stack -- f }
   effect-in-size 2@ drop      stack stack-in @ stack stack-out @ or 0<> ;
   effect-out-size 2@ drop max 0<> ;  
   
 : fstack-used?  
   effect-in-size 2@ nip  
   effect-out-size 2@ nip max 0<> ;  
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   1 function-number +!    1 function-number +!
Line 660 
Line 627 
     ." {" cr      ." {" cr
     declarations      declarations
     compute-offsets \ for everything else      compute-offsets \ for everything else
     dstack-used? IF ." Cell *sp=SP;" cr THEN      data-stack stack-used? IF ." Cell *sp=SP;" cr THEN
     fstack-used? IF ." Cell *fp=*FP;" cr THEN      fp-stack   stack-used? IF ." Cell *fp=*FP;" cr THEN
     flush-tos      flush-tos
     fetches      fetches
     stack-pointer-updates      stack-pointer-updates
     fstack-used? IF ." *FP=fp;" cr THEN      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" cr
     ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr      ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
     c-code 2@ type      c-code 2@ type
Line 690 
Line 657 
         \ this is bad for ec: an alias is compiled if tho word does not exist!          \ this is bad for ec: an alias is compiled if tho word does not exist!
         \ JAW          \ JAW
     ELSE  ." : " forth-name 2@ type ."   ( "      ELSE  ." : " forth-name 2@ type ."   ( "
         effect-in effect-in-end @ .stack-list ." -- "          stack-string 2@ type ." )" cr
         effect-out effect-out-end @ .stack-list ." )" cr  
         forth-code 2@ type cr          forth-code 2@ type cr
         -1 primitive-number +!          -1 primitive-number +!
     THEN ;      THEN ;

Generate output suitable for use with a patch program
Legend:
Removed from v.1.48  
changed lines
  Added in v.1.49
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help