[gforth] / gforth / prims2x.fs  

gforth: gforth/prims2x.fs

Diff for /gforth/prims2x.fs between version 1.52 and 1.56

version 1.52, Tue Nov 14 10:36:02 2000 UTC version 1.56, Tue Dec 26 19:24:18 2000 UTC
Line 87 
Line 87 
 : printprim ( -- )  : printprim ( -- )
  output @ execute ;   output @ execute ;
   
 \ stack types  
   
 struct%  struct%
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
     cell% 2* field stack-cast \ cast string for assignments to stack elements      cell% 2* field stack-cast \ cast string for assignments to stack elements
       cell%    field stack-in-index-xt \ ( in-size item -- in-index )
     cell%    field stack-in  \ number of stack items in effect in      cell%    field stack-in  \ number of stack items in effect in
     cell%    field stack-out \ number of stack items in effect out      cell%    field stack-out \ number of stack items in effect out
 end-struct stack%  end-struct stack%
   
   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%
   
   struct%
       cell% 2* field type-c-name
       cell%    field type-stack \ default stack
       cell%    field type-size  \ size of type in stack items
       cell%    field type-fetch \ xt of fetch code generator ( item -- )
       cell%    field type-store \ xt of store code generator ( item -- )
   end-struct type%
   
   : stack-in-index ( in-size item -- in-index )
       item-offset @ - 1- ;
   
   : inst-in-index ( in-size item -- in-index )
       nip dup item-offset @ swap item-type @ type-size @ + 1- ;
   
 : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )  : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
     create stack% %allot >r      create stack% %allot >r
     save-mem r@ stack-cast 2!      save-mem r@ stack-cast 2!
     save-mem r> stack-pointer 2! ;      save-mem r@ stack-pointer 2!
       ['] stack-in-index r> stack-in-index-xt ! ;
   
 s" sp" save-mem s" (Cell)" make-stack data-stack  s" sp" save-mem s" (Cell)" make-stack data-stack
 s" fp" save-mem s" "       make-stack fp-stack  s" fp" save-mem s" "       make-stack fp-stack
 s" rp" save-mem s" (Cell)" make-stack return-stack  s" rp" save-mem s" (Cell)" make-stack return-stack
   s" ip" save-mem s" error don't use # on results" make-stack inst-stream
   ' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out  \ !! initialize stack-in and stack-out
   
 \ stack items  \ 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 -- )  : init-item ( addr u addr1 -- )
     \ initialize item at addr1 with name addr u      \ initialize item at addr1 with name addr u
     \ !! remove stack prefix      \ !! remove stack prefix
Line 257 
Line 273 
 Variable forth-flag  Variable forth-flag
 Variable c-flag  Variable c-flag
   
   (( (( ` e || ` E )) {{ start }} nonl **
      {{ end evaluate }}
   )) <- eval-comment ( ... -- ... )
   
 (( (( ` f || ` F )) {{ start }} nonl **  (( (( ` f || ` F )) {{ start }} nonl **
    {{ end forth-flag @ IF type cr ELSE 2drop THEN }}     {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
 )) <- forth-comment ( -- )  )) <- forth-comment ( -- )
Line 283 
Line 303 
         THEN }}          THEN }}
 )) <- if-comment  )) <- if-comment
   
 (( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body  (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
   
 (( ` \ comment-body nl )) <- comment ( -- )  (( ` \ comment-body nl )) <- comment ( -- )
   
Line 332 
Line 352 
   
 \ types  \ types
   
 struct%  
     cell% 2* field type-c-name  
     cell%    field type-stack \ default stack  
     cell%    field type-size  \ size of type in stack items  
     cell%    field type-fetch \ xt of fetch code generator ( item -- )  
     cell%    field type-store \ xt of store code generator ( item -- )  
 end-struct type%  
   
 : stack-access ( n stack -- )  : stack-access ( n stack -- )
     \ print a stack access at index n of stack      \ print a stack access at index n of stack
     stack-pointer 2@ type      stack-pointer 2@ type
Line 350 
Line 362 
         drop ." TOS"          drop ." TOS"
     endif ;      endif ;
   
 : item-in-index ( item -- n )  : item-in-index { item -- n }
     \ n is the index of item (in the in-effect)      \ n is the index of item (in the in-effect)
     >r r@ item-stack @ stack-in @ r> item-offset @ - 1- ;      item item-stack @ dup >r stack-in @ ( in-size r:stack )
       item r> stack-in-index-xt @ execute ;
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
  \ fetch a single stack item from its stack   \ fetch a single stack item from its stack
Line 423 
Line 436 
  ." );" cr   ." );" cr
  rdrop ;   rdrop ;
   
   : single ( -- xt1 xt2 n )
       ['] fetch-single ['] store-single 1 ;
   
 : single-type ( -- xt1 xt2 n stack )  : double ( -- xt1 xt2 n )
  ['] fetch-single ['] store-single 1 data-stack ;      ['] fetch-double ['] store-double 2 ;
   
 : double-type ( -- xt1 xt2 n stack )  
  ['] fetch-double ['] store-double 2 data-stack ;  
   
 : float-type ( -- xt1 xt2 n stack )  
  ['] fetch-single ['] store-single 1 fp-stack ;  
   
 : s, ( addr u -- )  : s, ( addr u -- )
 \ allocate a string  \ allocate a string
Line 462 
Line 471 
     stack r@ type-stack !      stack r@ type-stack !
     rdrop ;      rdrop ;
   
 : type-prefix ( addr u xt1 xt2 n stack "prefix" -- )  : type-prefix ( xt1 xt2 n stack "prefix" -- )
     create-type      create-type
 does> ( item -- )  does> ( item -- )
     \ initialize item      \ initialize item
Line 510 
Line 519 
  effect-in effect-in-end @ declaration-list   effect-in effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;   effect-out effect-out-end @ declaration-list ;
   
 get-current  
 prefixes set-current  
   
 s" Bool"        single-type type-prefix f  
 s" Char"        single-type type-prefix c  
 s" Cell"        single-type type-prefix n  
 s" Cell"        single-type type-prefix w  
 s" UCell"       single-type type-prefix u  
 s" DCell"       double-type type-prefix d  
 s" UDCell"      double-type type-prefix ud  
 s" Float"       float-type  type-prefix r  
 s" Cell *"      single-type type-prefix a_  
 s" Char *"      single-type type-prefix c_  
 s" Float *"     single-type type-prefix f_  
 s" DFloat *"    single-type type-prefix df_  
 s" SFloat *"    single-type type-prefix sf_  
 s" Xt"          single-type type-prefix xt  
 s" WID"         single-type type-prefix wid  
 s" struct F83Name *"    single-type type-prefix f83name  
   
 return-stack stack-prefix R:  
   
 set-current  
   
 \ offset computation  \ offset computation
 \ 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
Line 553 
Line 538 
 : clear-stack { -- }  : clear-stack { -- }
     dup stack-in off stack-out off ;      dup stack-in off stack-out off ;
   
   
 : compute-offsets ( -- )  : compute-offsets ( -- )
     data-stack clear-stack  fp-stack clear-stack return-stack clear-stack      data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
       inst-stream clear-stack
     effect-in  effect-in-end  @ ['] stack-in  compute-list      effect-in  effect-in-end  @ ['] stack-in  compute-list
     effect-out effect-out-end @ ['] stack-out compute-list ;      effect-out effect-out-end @ ['] stack-out compute-list
       inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and      stack stack-out @ 0<> stack stack-in @ 0= and
Line 579 
Line 565 
     endif ;      endif ;
   
 : fill-tos ( -- )  : fill-tos ( -- )
       \ !! inst-stream for prefetching?
     fp-stack     fill-a-tos      fp-stack     fill-a-tos
     data-stack   fill-a-tos      data-stack   fill-a-tos
     return-stack fill-a-tos ;      return-stack fill-a-tos ;
Line 598 
Line 585 
         stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr          stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
     endif ;      endif ;
   
   : inst-pointer-update ( -- )
       inst-stream stack-in @ ?dup-if
           ." INC_IP(" 0 .r ." );" cr
       endif ;
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
       inst-pointer-update
     data-stack   stack-pointer-update      data-stack   stack-pointer-update
     fp-stack     stack-pointer-update      fp-stack     stack-pointer-update
     return-stack stack-pointer-update ;      return-stack stack-pointer-update ;
Line 653 
Line 646 
  cr   cr
 ;  ;
   
   : print-type-prefix ( type -- )
       body> >head .name ;
   
   : disasm-arg { item -- }
       item item-stack @ inst-stream = if
           ."   printarg_" item item-type @ print-type-prefix
           ." (ip[" item item-offset @ 1+ 0 .r ." ]);" cr
       endif ;
   
   : disasm-args ( -- )
    effect-in-end @ effect-in ?do
      i disasm-arg
    item% %size +loop ;
   
   : output-disasm ( -- )
       \ generate code for disassembling VM instructions
       ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
       ."   fputs(" [char] " emit forth-name 2@ type [char] " emit ." ,stdout);" cr
       ." /* " declarations ." */" cr
       compute-offsets
       disasm-args
       ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
       ." } else "
       1 function-number +! ;
   
 : stack-used? { stack -- f }  : stack-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;      stack stack-in @ stack stack-out @ or 0<> ;
   
Line 675 
Line 693 
     ." {" cr      ." {" cr
     declarations      declarations
     compute-offsets \ for everything else      compute-offsets \ for everything else
       inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
     data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN      data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
     fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN      fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
     return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN      return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN

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

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help