[gforth] / gforth / prims2x.fs  

gforth: gforth/prims2x.fs

Diff for /gforth/prims2x.fs between version 1.68 and 1.69

version 1.68, Thu Jan 18 19:43:02 2001 UTC version 1.69, Fri Jan 19 21:07:05 2001 UTC
Line 58 
Line 58 
   
 include ./gray.fs  include ./gray.fs
   
 100 constant max-effect \ number of things on one side of a stack effect  32 constant max-effect \ number of things on one side of a stack effect
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  maxchar 1+ constant eof-char
 #tab constant tab-char  #tab constant tab-char
Line 150 
Line 150 
   
 \ various variables for storing stuff of one primitive  \ various variables for storing stuff of one primitive
   
 2variable forth-name  struct%
 2variable wordset      cell% 2* field prim-name
 2variable c-name      cell% 2* field prim-wordset
 2variable doc      cell% 2* field prim-c-name
 2variable c-code      cell% 2* field prim-doc
 2variable forth-code      cell% 2* field prim-c-code
 2variable stack-string      cell% 2* field prim-forth-code
 create effect-in  max-effect item% %size * allot      cell% 2* field prim-stack-string
 create effect-out max-effect item% %size * allot      item% max-effect * field prim-effect-in
 variable effect-in-end ( pointer )      item% max-effect * field prim-effect-out
 variable effect-out-end ( pointer )      cell%    field prim-effect-in-end
       cell%    field prim-effect-out-end
   end-struct prim%
   
   create prim prim% %allot
   
   \ global vars
 variable c-line  variable c-line
 2variable c-filename  2variable c-filename
 variable name-line  variable name-line
 2variable name-filename  2variable name-filename
 2variable last-name-filename  2variable last-name-filename
   
 Variable function-number 0 function-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
Line 340 
Line 345 
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup items ! set-current
  effect-in effect-in-end @ declaration-list   prim prim-effect-in prim prim-effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;   prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
   
 : print-declaration { item -- }  : print-declaration { item -- }
     item item-first @ if      item item-first @ if
Line 350 
Line 355 
     endif ;      endif ;
   
 : print-declarations ( -- )  : print-declarations ( -- )
     effect-in  effect-in-end  @ ['] print-declaration map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] print-declaration map-items
     effect-out effect-out-end @ ['] print-declaration map-items ;      prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ;
   
 : stack-prefix ( stack "prefix" -- )  : stack-prefix ( stack "prefix" -- )
     name tuck nextname create ( stack length ) 2,      name tuck nextname create ( stack length ) 2,
Line 383 
Line 388 
 : 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      inst-stream clear-stack
     effect-in  effect-in-end  @ ['] compute-offset-in  map-items      prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     effect-out 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<> abort" # can only be on the input side" ;      inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
   
 : flush-a-tos { stack -- }  : flush-a-tos { stack -- }
Line 416 
Line 421 
  dup item-type @ type-fetch @ execute ;   dup item-type @ type-fetch @ execute ;
   
 : fetches ( -- )  : fetches ( -- )
     effect-in effect-in-end @ ['] fetch map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
   
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ stack grow downwards      \ stack grow downwards
Line 442 
Line 447 
  dup item-type @ type-store @ execute ;   dup item-type @ type-store @ execute ;
   
 : stores ( -- )  : stores ( -- )
     effect-out effect-out-end @ ['] store map-items ;      prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
   
 : output-c-tail ( -- )  : output-c-tail ( -- )
     \ the final part of the generated C code      \ the final part of the generated C code
Line 474 
Line 479 
 : print-debug-args ( -- )  : print-debug-args ( -- )
     ." #ifdef VM_DEBUG" cr      ." #ifdef VM_DEBUG" cr
     ." if (vm_debug) {" cr      ." if (vm_debug) {" cr
     effect-in effect-in-end @ ['] print-debug-arg map-items      prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
     ." fputc('\n', vm_out);" cr      ." fputc('\n', vm_out);" cr
     ." }" cr      ." }" cr
     ." #endif" cr ;      ." #endif" cr ;
   
 : output-c ( -- )  : output-c ( -- )
  ." I_" c-name 2@ type ." :     /* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr   ." I_" prim prim-c-name 2@ type ." :   /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr   ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" quote forth-name 2@ type quote ." )" cr \ debugging   ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  print-declarations   print-declarations
Line 493 
Line 498 
  stack-pointer-updates   stack-pointer-updates
  ." {" cr   ." {" cr
  ." #line " c-line @ . quote c-filename 2@ type quote cr   ." #line " c-line @ . quote c-filename 2@ type quote cr
  c-code 2@ type-c   prim prim-c-code 2@ type-c
  ." }" cr   ." }" cr
  output-c-tail   output-c-tail
  ." }" cr   ." }" cr
Line 509 
Line 514 
     endif ;      endif ;
   
 : disasm-args ( -- )  : disasm-args ( -- )
     effect-in effect-in-end @ ['] disasm-arg map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] disasm-arg map-items ;
   
 : output-disasm ( -- )  : output-disasm ( -- )
     \ generate code for disassembling VM instructions      \ generate code for disassembling VM instructions
     ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr      ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
     ."   fputs(" quote forth-name 2@ type quote ." , vm_out);" cr      ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
     disasm-args      disasm-args
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr      ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
     ." } else " ;      ." } else " ;
Line 526 
Line 531 
     endif ;      endif ;
   
 : gen-args-parm ( -- )  : gen-args-parm ( -- )
     effect-in effect-in-end @ ['] gen-arg-parm map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
   
 : gen-arg-gen { item -- }  : gen-arg-gen { item -- }
     item item-stack @ inst-stream = if      item item-stack @ inst-stream = if
Line 535 
Line 540 
     endif ;      endif ;
   
 : gen-args-gen ( -- )  : gen-args-gen ( -- )
     effect-in effect-in-end @ ['] gen-arg-gen map-items ;      prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-gen map-items ;
   
 : output-gen ( -- )  : output-gen ( -- )
     \ generate C code for generating VM instructions      \ generate C code for generating VM instructions
     ." void gen_" c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr      ." void gen_" prim prim-c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
     ." {" cr      ." {" cr
     ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr      ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr
     gen-args-gen      gen-args-gen
Line 549 
Line 554 
     stack stack-in @ stack stack-out @ or 0<> ;      stack stack-in @ stack stack-out @ or 0<> ;
   
 : output-funclabel ( -- )  : output-funclabel ( -- )
   ." &I_" c-name 2@ type ." ," cr ;    ." &I_" prim prim-c-name 2@ type ." ," cr ;
   
 : output-forthname ( -- )  : output-forthname ( -- )
   '" emit forth-name 2@ type '" emit ." ," cr ;    '" emit prim prim-name 2@ type '" emit ." ," cr ;
   
 : output-c-func ( -- )  : output-c-func ( -- )
 \ used for word libraries  \ used for word libraries
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type      ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " prim prim-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr      ."  ( " prim prim-stack-string 2@ type ."  ) */" cr
     ." /* " doc 2@ type ."  */" cr      ." /* " prim prim-doc 2@ type ."  */" cr
     ." NAME(" quote forth-name 2@ type quote ." )" cr      ." NAME(" quote prim prim-name 2@ type quote ." )" cr
     \ debugging      \ debugging
     ." {" cr      ." {" cr
     print-declarations      print-declarations
Line 573 
Line 578 
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN      fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr      ." {" cr
     ." #line " c-line @ . quote c-filename 2@ type quote cr      ." #line " c-line @ . quote c-filename 2@ type quote cr
     c-code 2@ type      prim prim-c-code 2@ type
     ." }" cr      ." }" cr
     stores      stores
     fill-tos      fill-tos
Line 582 
Line 587 
     cr ;      cr ;
   
 : output-label ( -- )  : output-label ( -- )
     ." (Label)&&I_" c-name 2@ type ." ," cr ;      ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
   
 : output-alias ( -- )  : output-alias ( -- )
     ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr ;      ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
   
 : output-forth ( -- )  : output-forth ( -- )
     forth-code @ 0=      prim prim-forth-code @ 0=
     IF          \ output-alias      IF          \ output-alias
         \ 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  ." : " prim prim-name 2@ type ."   ( "
         stack-string 2@ type ." )" cr          prim prim-stack-string 2@ type ." )" cr
         forth-code 2@ type cr          prim prim-forth-code 2@ type cr
     THEN ;      THEN ;
   
 : output-tag-file ( -- )  : output-tag-file ( -- )
Line 607 
Line 612 
   
 : output-tag ( -- )  : output-tag ( -- )
     output-tag-file      output-tag-file
     forth-name 2@ 1+ type      prim prim-name 2@ 1+ type
     127 emit      127 emit
     space forth-name 2@ type space      space prim prim-name 2@ type space
     1 emit      1 emit
     name-line @ 0 .r      name-line @ 0 .r
     ." ,0" cr ;      ." ,0" cr ;
Line 617 
Line 622 
 [IFDEF] documentation  [IFDEF] documentation
 : register-doc ( -- )  : register-doc ( -- )
     get-current documentation set-current      get-current documentation set-current
     forth-name 2@ nextname create      prim prim-name 2@ nextname create
     forth-name 2@ 2,      prim prim-name 2@ 2,
     stack-string 2@ condition-stack-effect 2,      prim prim-stack-string 2@ condition-stack-effect 2,
     wordset 2@ 2,      prim prim-wordset 2@ 2,
     c-name 2@ condition-pronounciation 2,      prim prim-c-name 2@ condition-pronounciation 2,
     doc 2@ 2,      prim prim-doc 2@ 2,
     set-current ;      set-current ;
 [THEN]  [THEN]
   
   
   \ combining instructions
   
   \ The input should look like this:
   
   \ lit_+ = lit +
   
   \ The output should look like this:
   
   \  I_lit_+:
   \  {
   \  DEF_CA
   \  Cell _x_ip0;
   \  Cell _x_sp0;
   \  Cell _x_sp1;
   \  NEXT_P0;
   \  _x_ip0 = (Cell) IPTOS;
   \  _x_sp0 = (Cell) spTOS;
   \  INC_IP(1);
   \  /* sp += 0; */
   \  /* lit ( #w -- w ) */
   \  /*  */
   \  NAME("lit")
   \  {
   \  Cell w;
   \  w = (Cell) _x_ip0;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" w=", vm_out); printarg_w (w);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 136 "./prim"
   \  }
   \  _x_sp1 = (Cell)w;
   \  }
   \  I_plus:      /* + ( n1 n2 -- n ) */
   \  /*  */
   \  NAME("+")
   \  {
   \  DEF_CA
   \  Cell n1;
   \  Cell n2;
   \  Cell n;
   \  NEXT_P0;
   \  n1 = (Cell) _x_sp0;
   \  n2 = (Cell) _x_sp1;
   \  #ifdef VM_DEBUG
   \  if (vm_debug) {
   \  fputs(" n1=", vm_out); printarg_n (n1);
   \  fputs(" n2=", vm_out); printarg_n (n2);
   \  fputc('\n', vm_out);
   \  }
   \  #endif
   \  {
   \  #line 516 "./prim"
   \  n = n1+n2;
   \  }
   \  NEXT_P1;
   \  _x_sp0 = (Cell)n;
   \  NEXT_P2;
   \  }
   \  NEXT_P1;
   \  spTOS = (Cell)_x_sp0;
   \  NEXT_P2;
   
   
 \ the parser  \ the parser
   
 eof-char max-member \ the whole character set + EOF  eof-char max-member \ the whole character set + EOF
Line 777 
Line 849 
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **  (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
 <- stack-items  <- stack-items
   
 (( {{ effect-in }}  stack-items {{ effect-in-end ! }}  (( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
    ` - ` - white **     ` - ` - white **
    {{ effect-out }} stack-items {{ effect-out-end ! }}     {{ prim prim-effect-out }} stack-items {{ prim prim-effect-out-end ! }}
 )) <- stack-effect ( -- )  )) <- stack-effect ( -- )
   
 (( {{ s" " doc 2! s" " forth-code 2! s" " wordset 2! }}  ((
    (( {{ line @ name-line ! filename 2@ name-filename 2! }}     ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
       {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++     (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **        (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
         (( {{ start }} forth-ident {{ end wordset 2! }} white **  
            (( {{ start }}  c-ident {{ end c-name 2! }} )) ??  
         )) ??  nl          )) ??  nl
    ))     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end c-code 2! skipsynclines on }}  
    (( ` :  white ** nl     (( ` :  white ** nl
       {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
    )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}     )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
    (( nl || eof ))     (( nl || eof ))
   )) <- simple-primitive ( -- )
   
   (( ` = (( white ++ forth-ident )) ++ (( nl || eof ))
   )) <- combined-primitive
   
   (( {{ s" " prim prim-doc 2! s" " prim prim-forth-code 2! s" " prim prim-wordset 2!
         line @ name-line ! filename 2@ name-filename 2!
         start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
      (( simple-primitive || combined-primitive ))
 )) <- primitive ( -- )  )) <- primitive ( -- )
   
 (( (( comment || primitive || nl white ** )) ** eof ))  (( (( comment || primitive || nl white ** )) ** eof ))
Line 804 
Line 882 
 .( parser generated ok ) cr  .( parser generated ok ) cr
 [THEN]  [THEN]
   
 : primfilter ( file-id xt -- )  : primfilter ( addr u -- )
 \ fileid is for the input file, xt ( -- ) is for the output word      \ process the string at addr u
  output !      over dup rawinput ! dup line-start ! cookedinput !
  here dup rawinput ! dup line-start ! cookedinput !      + endrawinput !
  here unused rot read-file throw  
  dup here + endrawinput !  
  allot  
  align  
  checksyncline   checksyncline
 \ begin  
 \     getinput dup eof-char = ?EXIT emit true ?nextchar  
 \ again ;  
  primitives2something ;   primitives2something ;
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
     >r      output !
     save-mem 2dup filename 2!      save-mem 2dup filename 2!
     0 function-number !      slurp-file
     r/o open-file abort" cannot open file"  
     warnings @ if      warnings @ if
         ." ------------ CUT HERE -------------" cr  endif          ." ------------ CUT HERE -------------" cr  endif
     r> primfilter ;      primfilter ;
   
 : process      ( xt -- )  : process      ( xt -- )
     bl word count rot      bl word count rot

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

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help