Diff for /gforth/prims2x.fs between versions 1.119 and 1.122

version 1.119, 2002/10/12 18:36:25 version 1.122, 2002/12/08 09:57:53
Line 95  variable include-skipped-insts Line 95  variable include-skipped-insts
 \ inline arguments (false)  \ inline arguments (false)
 include-skipped-insts off  include-skipped-insts off
   
   variable immarg \ values for immediate arguments (to be used in IMM_ARG macros)
   $12340000 immarg !
   
 : th ( addr1 n -- addr2 )  : th ( addr1 n -- addr2 )
     cells + ;      cells + ;
   
Line 325  Variable function-number 0 function-numb Line 328  Variable function-number 0 function-numb
 : complement ( set1 -- set2 )  : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;   empty ['] bit-equivalent binary-set-operation ;
   
   \ forward declaration for inst-stream (breaks cycle in definitions)
   defer inst-stream-f ( -- stack )
   
 \ stack access stuff  \ stack access stuff
   
 : normal-stack-access ( n stack -- )  : normal-stack-access1 ( n stack -- )
     stack-pointer 2@ type      stack-pointer 2@ type
     dup      dup
     if      if
Line 336  Variable function-number 0 function-numb Line 342  Variable function-number 0 function-numb
         drop ." TOS"          drop ." TOS"
     endif ;      endif ;
   
 \ forward declaration for inst-stream (breaks cycle in definitions)  : normal-stack-access ( n stack -- )
 defer inst-stream-f ( -- stack )      dup inst-stream-f = if
           ." IMM_ARG(" normal-stack-access1 ." ," immarg ? ." )"
           1 immarg +!
       else
           normal-stack-access1
       endif ;
   
 : stack-depth { stack -- n }  : stack-depth { stack -- n }
     current-depth stack stack-number @ th @ ;      current-depth stack stack-number @ th @ ;
Line 657  stack inst-stream IP Cell Line 668  stack inst-stream IP Cell
 : fetches ( -- )  : fetches ( -- )
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
   
 : inst-pointer-update ( -- )  
     inst-stream stack-in @ ?dup-if  
         ." INC_IP(" 0 .r ." );" cr  
     endif ;  
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stack grow downwards
     stack stack-diff      stack stack-diff
     ?dup-if \ this check is not necessary, gcc would do this for us      ?dup-if \ this check is not necessary, gcc would do this for us
         stack inst-stream = if          stack inst-stream = if
             inst-pointer-update              ." INC_IP(" 0 .r ." );" cr
         else          else
             stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr              stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
         endif          endif
Line 718  stack inst-stream IP Cell Line 724  stack inst-stream IP Cell
     endif      endif
     2drop ;      2drop ;
   
 : output-c-tail1 ( -- )  : output-label2 ( -- )
     \ the final part of the generated C code before stores      ." LABEL2(" prim prim-c-name 2@ type ." )" cr
       ." NEXT_P2;" cr ;
   
   : output-c-tail1 { xt -- }
       \ the final part of the generated C code, with xt printing LABEL2 or not.
     output-super-end      output-super-end
     print-debug-results      print-debug-results
     ." NEXT_P1;" cr ;      ." NEXT_P1;" cr
   
 : output-c-tail ( -- )  
     \ the final part of the generated C code, without LABEL2  
     output-c-tail1  
     stores      stores
     fill-tos       fill-tos 
     ." NEXT_P2;" ;      xt execute ;
   
 : output-c-tail-no-stores ( -- )  : output-c-tail1-no-stores { xt -- }
     \ the final part of the generated C code, without LABEL2      \ the final part of the generated C code for combinations
     output-c-tail1      output-super-end
       ." NEXT_P1;" cr
     fill-tos       fill-tos 
     ." NEXT_P2;" ;      xt execute ;
   
   : output-c-tail ( -- )
       ['] noop output-c-tail1 ;
   
 : output-c-tail2 ( -- )  : output-c-tail2 ( -- )
     \ the final part of the generated C code, including LABEL2      ['] output-label2 output-c-tail1 ;
     output-c-tail1  
     stores  : output-c-tail-no-stores ( -- )
     fill-tos       ['] noop output-c-tail1-no-stores ;
     ." LABEL2(" prim prim-c-name 2@ type ." )" cr  
     ." NEXT_P2;" cr ;  
   
 : output-c-tail2-no-stores ( -- )  : output-c-tail2-no-stores ( -- )
     \ the final part of the generated C code, including LABEL2      ['] output-label2 output-c-tail1-no-stores ;
     output-c-tail1  
     fill-tos   
     ." LABEL2(" prim prim-c-name 2@ type ." )" cr  
     ." NEXT_P2;" cr ;  
   
 : type-c-code ( c-addr u xt -- )  : type-c-code ( c-addr u xt -- )
     \ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt      \ like TYPE, but replaces "INST_TAIL;" with tail code produced by xt
Line 918  stack inst-stream IP Cell Line 922  stack inst-stream IP Cell
 : output-alias ( -- )   : output-alias ( -- ) 
     ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
   
 : output-prim-num ( -- )  : output-c-prim-num ( -- )
     prim prim-num @ 8 + 4 .r space prim prim-name 2@ type cr ;      ." #define N_" prim prim-c-name 2@ type prim prim-num @ 8 + 4 .r cr ;
   
 : output-forth ( -- )    : output-forth ( -- )  
     prim prim-forth-code @ 0=      prim prim-forth-code @ 0=

Removed from v.1.119  
changed lines
  Added in v.1.122


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