Diff for /gforth/prims2x.fs between versions 1.6 and 1.13

version 1.6, 1994/08/25 15:25:33 version 1.13, 1995/02/22 18:40:19
Line 21 Line 21
   
 warnings off  warnings off
   
 [IFUNDEF] vocabulary  include search-order.fs [THEN]  [IFUNDEF] vocabulary    include search-order.fs [THEN]
   [IFUNDEF] environment?  include environ.fs      [THEN]
 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 37  maxchar 1+ constant eof-char Line 38  maxchar 1+ constant eof-char
   begin ( c-addr file-id )    begin ( c-addr file-id )
     2dup batch-size swap read-file       2dup batch-size swap read-file 
     if      if
       abort" I/O error"        true abort" I/O error"
     endif      endif
     ( c-addr file-id actual-size ) rot over + -rot      ( c-addr file-id actual-size ) rot over + -rot
     batch-size <>      batch-size <>
Line 241  constant type-description Line 242  constant type-description
   
 : fetch-single ( item -- )  : fetch-single ( item -- )
  >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-d-offset @ effect-in-size 2@ data-stack-access ." ;" cr
  rdrop ;    rdrop ; 
   
 : fetch-double ( item -- )  : fetch-double ( item -- )
  >r   >r
  ." {Double_Store _d; _d.cells.low = "   r@ item-name 2@ type 
    ." = ({Double_Store _d; _d.cells.low = "
  r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access   r@ item-d-offset @ dup    effect-in-size 2@ data-stack-access
  ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access ." ; "   ." ; _d.cells.high = " 1+ effect-in-size 2@ data-stack-access
  r@ item-name 2@ type ."  = _d.dcell;}" cr   ." ; _d.dcell;});" cr
  rdrop ;   rdrop ;
   
 : fetch-float ( item -- )  : fetch-float ( item -- )
  >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-f-offset @ effect-in-size 2@ fp-stack-access ." ;" cr   r@ item-f-offset @ effect-in-size 2@ fp-stack-access ." ;" cr
  rdrop ;   rdrop ;
Line 265  constant type-description Line 269  constant type-description
 \ f is true iff the offset of item is the same as on input  \ 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=
  if   abort" bug"
    ." bug" cr abort  
  endif  
  execute @   execute @
  dup r@ =   dup r@ =
  if \ item first appeared in output   if \ item first appeared in output
Line 313  constant type-description Line 315  constant type-description
 \ f is true iff the offset of item is the same as on input  \ 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=
  if   abort" bug"
    ." bug" cr abort  
  endif  
  execute @   execute @
  dup r@ =   dup r@ =
  if \ item first appeared in output   if \ item first appeared in output
Line 348  constant type-description Line 348  constant type-description
  endif   endif
  rdrop ;   rdrop ;
     
 : single-type ( -- xt n1 n2 )  : single-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-single ['] store-single 1 0 ;   ['] fetch-single ['] store-single 1 0 ;
   
 : double-type ( -- xt n1 n2 )  : double-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-double ['] store-double 2 0 ;   ['] fetch-double ['] store-double 2 0 ;
   
 : float-type ( -- xt n1 n2 )  : float-type ( -- xt1 xt2 n1 n2 )
  ['] fetch-float ['] store-float 0 1 ;   ['] fetch-float ['] store-float 0 1 ;
   
 : s, ( addr u -- )  : s, ( addr u -- )
Line 407  set-current Line 407  set-current
    endif     endif
  -1 s+loop   -1 s+loop
  \ we did not find a type, abort   \ we did not find a type, abort
  ." unknown type prefix" cr ABORT ;   true abort" unknown type prefix" ;
   
 : declare ( addr "name" -- )  : declare ( addr "name" -- )
 \ remember that there is a stack item at addr called name  \ remember that there is a stack item at addr called name
Line 429  set-current Line 429  set-current
   i declaration    i declaration
  item-descr +loop ;   item-descr +loop ;
   
   : fetch ( addr -- )
    dup item-type @ type-fetch-handler execute ;
   
 : declarations ( -- )  : declarations ( -- )
  wordlist dup items ! set-current   wordlist dup items ! set-current
  effect-in effect-in-end @ declaration-list   effect-in effect-in-end @ declaration-list
Line 480  set-current Line 483  set-current
    ." IF_TOS(TOS = sp[0]);" cr     ." IF_TOS(TOS = sp[0]);" cr
  endif ;   endif ;
   
 : fetch ( addr -- )  
  dup item-type @ type-fetch-handler execute ;  
   
 : fetches ( -- )  : fetches ( -- )
  effect-in-end @ effect-in ?do   effect-in-end @ effect-in ?do
    i fetch     i fetch
  item-descr +loop ;    item-descr +loop ; 
   
 : stack-pointer-updates ( -- )  : stack-pointer-updates ( -- )
 \ we do not check if an update is a noop; gcc does this for us  \ we need not check if an update is a noop; gcc does this for us
  effect-in-size 2@   effect-in-size 2@
  effect-out-size 2@   effect-out-size 2@
  rot swap - ( d-in d-out f-diff )   rot swap - ( d-in d-out f-diff )
Line 507  set-current Line 507  set-current
    i store     i store
  item-descr +loop ;    item-descr +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
  ." /* " doc 2@ type ."  */" cr   ." /* " doc 2@ type ."  */" cr
    ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
  ." {" cr   ." {" cr
  ." DEF_CA" cr   ." DEF_CA" cr
  declarations   declarations
  compute-offsets \ for everything else   compute-offsets \ for everything else
    ." NEXT_P0;" cr
  flush-tos   flush-tos
  fetches   fetches
  stack-pointer-updates cr   stack-pointer-updates
  ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging  
  ." {" cr   ." {" cr
  c-code 2@ type   c-code 2@ type
  ." }" cr   ." }" cr
  ." NEXT_P1;" cr   ." NEXT_P1;" cr
  stores   stores
  fill-tos   fill-tos
  ." NEXT1_P2;" cr   ." NEXT_P2;" cr
  ." }" cr   ." }" cr
  cr   cr
 ;  ;
Line 536  set-current Line 542  set-current
  primitive-number @ . ." alias " forth-name 2@ type cr   primitive-number @ . ." alias " forth-name 2@ type cr
  -1 primitive-number +! ;   -1 primitive-number +! ;
   
   : output-forth ( -- )
    forth-code @ 0=
    IF    output-alias
    ELSE  ." : " forth-name 2@ type ."   ( "
          effect-in effect-in-end @ .stack-list ." -- "
          effect-out effect-out-end @ .stack-list ." )" cr
          forth-code 2@ type cr
          -1 primitive-number +!
    THEN ;
   
   [IFDEF] documentation
   : register-doc ( -- )
       get-current documentation set-current
       forth-name 2@ nextname create
       forth-name 2@ 2,
       stack-string 2@ 2,
       wordset 2@ 2,
       c-name 2@ 2,
       doc 2@ 2,
       set-current ;
   [THEN]
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
  >r r/o open-file   >r r/o open-file abort" cannot open file"
  if  
    ." cannot open file" cr abort  
  endif  
  warnings @ if   warnings @ if
  ." ------------ CUT HERE -------------" cr  endif   ." ------------ CUT HERE -------------" cr  endif
  r> primfilter ;   r> primfilter ;

Removed from v.1.6  
changed lines
  Added in v.1.13


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