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

version 1.119, 2002/10/12 18:36:25 version 1.138, 2003/05/13 09:36:59
Line 1 Line 1
 \ converts primitives to, e.g., C code   \ converts primitives to, e.g., C code 
   
 \ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 51 Line 51
 \ (stack-in-index-xt and a test for stack==instruction-stream); there  \ (stack-in-index-xt and a test for stack==instruction-stream); there
 \ should be only one.  \ should be only one.
   
   \ for backwards compatibility, jaw
   require compat/strcomp.fs
   
 warnings off  warnings off
   
   \ redefinitions of kernel words not present in gforth-0.6.1
   : latestxt lastcfa @ ;
   : latest last @ ;
   
 [IFUNDEF] try  [IFUNDEF] try
 include startup.fs  include startup.fs
 [THEN]  [THEN]
Line 63  warnings off Line 70  warnings off
 \ warnings on  \ warnings on
   
 include ./gray.fs  include ./gray.fs
 32 constant max-effect \ number of things on one side of a stack effect  128 constant max-effect \ number of things on one side of a stack effect
 4 constant max-stacks  \ the max. number of stacks (including inst-stream).  4 constant max-stacks  \ the max. number of stacks (including inst-stream).
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  maxchar 1+ constant eof-char
Line 95  variable include-skipped-insts Line 102  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 159  struct% Line 169  struct%
     cell% 2* field stack-pointer \ stackpointer name      cell% 2* field stack-pointer \ stackpointer name
     cell%    field stack-type \ name for default type of stack items      cell%    field stack-type \ name for default type of stack items
     cell%    field stack-in-index-xt \ ( in-size item -- in-index )      cell%    field stack-in-index-xt \ ( in-size item -- in-index )
       cell%    field stack-access-transform \ ( nitem -- index )
 end-struct stack%  end-struct stack%
   
 struct%  struct%
Line 194  create stacks max-stacks cells allot \ a Line 205  create stacks max-stacks cells allot \ a
     1 next-stack-number +!      1 next-stack-number +!
     r@ stack-type !      r@ stack-type !
     save-mem r@ stack-pointer 2!       save-mem r@ stack-pointer 2! 
     ['] stack-in-index r> stack-in-index-xt ! ;      ['] stack-in-index r@ stack-in-index-xt !
       ['] noop r@ stack-access-transform !
       rdrop ;
   
 : map-stacks { xt -- }  : map-stacks { xt -- }
     \ perform xt for all stacks      \ perform xt for all stacks
Line 325  Variable function-number 0 function-numb Line 338  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-access0 { n stack -- }
     stack-pointer 2@ type      n stack stack-access-transform @ execute ." [" 0 .r ." ]" ;
     dup      
     if  : normal-stack-access1 { n stack -- }
         ." [" 0 .r ." ]"      stack stack-pointer 2@ type
       n if
           n stack normal-stack-access0
     else      else
         drop ." TOS"          ." 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 592  wordlist constant type-names \ this is h Line 615  wordlist constant type-names \ this is h
     get-current type-names set-current      get-current type-names set-current
     stack-type 2dup nextname stack-type-name      stack-type 2dup nextname stack-type-name
     set-current      set-current
     stack-pointer lastxt >body stack-name nextname make-stack ;      stack-pointer latestxt >body stack-name nextname make-stack ;
   
 stack inst-stream IP Cell  stack inst-stream IP Cell
 ' inst-in-index inst-stream stack-in-index-xt !  ' inst-in-index inst-stream stack-in-index-xt !
Line 615  stack inst-stream IP Cell Line 638  stack inst-stream IP Cell
 : compute-offset-out ( addr1 addr2 -- )  : compute-offset-out ( addr1 addr2 -- )
     ['] stack-out compute-offset ;      ['] stack-out compute-offset ;
   
 : clear-stack ( stack -- )  
     dup stack-in off stack-out off ;  
   
 : compute-offsets ( -- )  : compute-offsets ( -- )
     ['] clear-stack map-stacks      prim prim-stacks-in  max-stacks cells erase
       prim prim-stacks-out max-stacks cells erase
     prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items      prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items
     inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;      inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
Line 634  stack inst-stream IP Cell Line 655  stack inst-stream IP Cell
     stack stack-out @ 0<> stack stack-in @ 0= and      stack stack-out @ 0<> stack stack-in @ 0= and
     if      if
         ." IF_" stack stack-pointer 2@ 2dup type ." TOS("          ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
         2dup type ." [0] = " type ." TOS);" cr          2dup type 0 stack normal-stack-access0 ."  = " type ." TOS);" cr
     endif ;      endif ;
   
 : flush-tos ( -- )  : flush-tos ( -- )
Line 644  stack inst-stream IP Cell Line 665  stack inst-stream IP Cell
     stack stack-out @ 0= stack stack-in @ 0<> and      stack stack-out @ 0= stack stack-in @ 0<> and
     if      if
         ." IF_" stack stack-pointer 2@ 2dup type ." TOS("          ." IF_" stack stack-pointer 2@ 2dup type ." TOS("
         2dup type ." TOS = " type ." [0]);" cr          2dup type ." TOS = " type 0 stack normal-stack-access0 ." );" cr
     endif ;      endif ;
   
 : fill-tos ( -- )  : fill-tos ( -- )
Line 657  stack inst-stream IP Cell Line 678  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 ( -- )  : stack-update-transform ( n1 stack -- n2 )
     inst-stream stack-in @ ?dup-if      \ n2 is the number by which the stack pointer should be
         ." INC_IP(" 0 .r ." );" cr      \ incremented to pop n1 items
     endif ;      stack-access-transform @ dup >r execute
       0 r> execute - ;
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stacks 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 ."  += "
               stack stack-update-transform 0 .r ." ;" cr
         endif          endif
     endif ;      endif ;
   
Line 718  stack inst-stream IP Cell Line 741  stack inst-stream IP Cell
     endif      endif
     2drop ;      2drop ;
   
 : output-c-tail1 ( -- )  : output-nextp2 ( -- )
     \ the final part of the generated C code before stores      ." NEXT_P2;" cr ;
   
   variable tail-nextp2 \ xt to execute for printing NEXT_P2 in INST_TAIL
   ' output-nextp2 tail-nextp2 !
   
   : output-label2 ( -- )
       ." 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 ( -- )
       tail-nextp2 @ 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       tail-nextp2 @ 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 945  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=
Line 1162  stack inst-stream IP Cell Line 1189  stack inst-stream IP Cell
     r> in-part ! ;      r> in-part ! ;
   
 : part-stack-pointer-updates ( -- )  : part-stack-pointer-updates ( -- )
     max-stacks 0 +do      next-stack-number @ 0 +do
         i part-num @ 1+ s-c-max-depth @ dup          i part-num @ 1+ s-c-max-depth @ dup
         i num-combined @ s-c-max-depth @ =    \ final depth          i num-combined @ s-c-max-depth @ =    \ final depth
         swap i part-num @ s-c-max-depth @ <> \ just reached now          swap i part-num @ s-c-max-depth @ <> \ just reached now
Line 1244  stack inst-stream IP Cell Line 1271  stack inst-stream IP Cell
 \    int loads;       /* number of stack loads */  \    int loads;       /* number of stack loads */
 \    int stores;      /* number of stack stores */  \    int stores;      /* number of stack stores */
 \    int updates;     /* number of stack pointer updates */  \    int updates;     /* number of stack pointer updates */
   \    int offset;      /* offset into super2 table */
 \    int length;      /* number of components */  \    int length;      /* number of components */
 \    int *components; /* array of vm_prim indexes of components */  
 \  };  \  };
   
 \ How do you know which primitive or combined instruction this  \ How do you know which primitive or combined instruction this
Line 1270  stack inst-stream IP Cell Line 1297  stack inst-stream IP Cell
 : output-num-part ( p -- )  : output-num-part ( p -- )
     prim-num @ 4 .r ." ," ;      prim-num @ 4 .r ." ," ;
   
   : super2-length ( -- n )
       combined if
           num-combined @
       else
           1
       endif ;
   
   : output-name-comment ( -- )
       ."  /* " prim prim-name 2@ type ."  */" ;
   
   variable offset-super2  0 offset-super2 ! \ offset into the super2 table
   
 : output-costs ( -- )  : output-costs ( -- )
       \ description of superinstructions and simple instructions
     ." {" prim compute-costs      ." {" prim compute-costs
     rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"      rot 2 .r ." ," swap 2 .r ." ," 2 .r ." ,"
       offset-super2 @ 5 .r ." ,"
       super2-length dup 2 .r ." }," offset-super2 +!
       output-name-comment
       cr ;
   
   : output-super2 ( -- )
       \ table of superinstructions without requirement for existing prefixes
     combined if      combined if
         num-combined @ 2 .r          ['] output-num-part map-combined 
         ." , ((int []){" ['] output-num-part map-combined ." })}, /* "  
     else      else
         ."  1, ((int []){" prim prim-num @ 4 .r ." })}, /* "          prim output-num-part
     endif      endif
     prim prim-name 2@ type ."  */"      output-name-comment
     cr ;      cr ;   
   
 \ the parser  \ the parser
   
Line 1306  print-token ! Line 1352  print-token !
  getinput member? ;   getinput member? ;
 ' testchar? test-vector !  ' testchar? test-vector !
   
 : checksyncline ( -- )  : checksynclines ( -- )
     \ 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.
     rawinput @ >r      rawinput @ begin >r
     s" #line " r@ over compare if          s" #line " r@ over compare 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] " <> 0= s" sync line syntax" ?print-error              char+ dup c@ [char] " <> 0= s" sync line syntax" ?print-error
         char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!              char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
         char+              char+
     endif          endif
     dup c@ nl-char <> 0= s" sync line syntax" ?print-error          dup c@ nl-char <> 0= s" sync line syntax" ?print-error
     skipsynclines @ if          skipsynclines @ if
         dup char+ rawinput !              char+ dup rawinput !
         rawinput @ c@ cookedinput @ c!              rawinput @ c@ cookedinput @ c!
     endif          endif
     drop ;      again ;
   
 : ?nextchar ( f -- )  : ?nextchar ( f -- )
     s" syntax error, wrong char" ?print-error      s" syntax error, wrong char" ?print-error
Line 1333  print-token ! Line 1379  print-token !
         1 chars rawinput +!          1 chars rawinput +!
         1 chars cookedinput +!          1 chars cookedinput +!
         nl-char = if          nl-char = if
             checksyncline              checksynclines
             rawinput @ line-start !              rawinput @ line-start !
         endif          endif
         rawinput @ c@ cookedinput @ c!          rawinput @ c@
           cookedinput @ c!
     endif ;      endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
Line 1414  Variable c-flag Line 1461  Variable c-flag
 (( (( ` g || ` G )) {{ start }} nonl **  (( (( ` g || ` G )) {{ start }} nonl **
    {{ end     {{ end
       forth-flag @ IF  ." group " type cr  THEN        forth-flag @ IF  ." group " type cr  THEN
       c-flag @     IF  ." GROUP(" type ." )" cr  THEN }}        c-flag @     IF  ." GROUP(" type ." , " function-number @ 0 .r ." )" cr  THEN }}
 )) <- group-comment  )) <- group-comment
   
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body  (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment || group-comment )) ?? nonl ** )) <- comment-body
Line 1456  Variable c-flag Line 1503  Variable c-flag
       start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end        start }} [ifdef] vmgen c-ident [else] forth-ident [then] {{ end
       2dup prim prim-name 2! prim prim-c-name 2! }}  white **        2dup prim prim-name 2! prim prim-c-name 2! }}  white **
    (( ` / white ** {{ start }} c-ident {{ end prim prim-c-name 2! }} white ** )) ??     (( ` / white ** {{ start }} c-ident {{ end prim prim-c-name 2! }} white ** )) ??
    (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}     (( simple-primitive || combined-primitive ))
      {{ 1 function-number +! }}
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl white ** )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
Line 1481  warnings @ [IF] Line 1529  warnings @ [IF]
     \ process the string at addr u      \ process the string at addr u
     over dup rawinput ! dup line-start ! cookedinput !      over dup rawinput ! dup line-start ! cookedinput !
     + endrawinput !      + endrawinput !
     checksyncline      checksynclines
     primitives2something ;          primitives2something ;    
   
   : unixify ( c-addr u1 -- c-addr u2 )
       \ delete crs from the string
       bounds tuck tuck ?do ( c-addr1 )
           i c@ dup #cr <> if
               over c! char+
           else
               drop
           endif
       loop
       over - ;
   
 : process-file ( addr u xt-simple x-combined -- )  : process-file ( addr u xt-simple x-combined -- )
     output-combined ! output !      output-combined ! output !
     save-mem 2dup filename 2!      save-mem 2dup filename 2!
     slurp-file      slurp-file unixify
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     primfilter ;      primfilter ;

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


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