Diff for /gforth/prims2x.fs between versions 1.7 and 1.17

version 1.7, 1994/09/08 17:20:12 version 1.17, 1995/12/23 16:21:59
Line 1 Line 1
   \ converts primitives to, e.g., C code 
   
   \ Copyright (C) 1995 Free Software Foundation, Inc.
   
   \ This file is part of Gforth.
   
   \ Gforth is free software; you can redistribute it and/or
   \ modify it under the terms of the GNU General Public License
   \ as published by the Free Software Foundation; either version 2
   \ of the License, or (at your option) any later version.
   
   \ This program is distributed in the hope that it will be useful,
   \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   \ GNU General Public License for more details.
   
   \ You should have received a copy of the GNU General Public License
   \ along with this program; if not, write to the Free Software
   \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
   
 \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)  \ This is not very nice (hard limits, no checking, assumes 1 chars = 1)
   
 \ Optimizations:  \ Optimizations:
Line 15 Line 36
 \ 5) Words that call NEXT themselves have to be done very carefully.  \ 5) Words that call NEXT themselves have to be done very carefully.
 \  \
 \ To do:  \ To do:
   \ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement  \ regarding problem 1 above: It would be better (for over) to implement
 \       the alternative  \       the alternative
   
 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
 4096 constant batch-size \ no meaning, just make sure it's >0  4096 constant batch-size \ no meaning, just make sure it's >0
 255 constant maxchar  255 constant maxchar
 maxchar 1+ constant eof-char  maxchar 1+ constant eof-char
 9 constant tab-char  #tab constant tab-char
 10 constant nl-char  #lf constant nl-char
   
 : read-whole-file ( c-addr1 file-id -- c-addr2 )  : read-whole-file ( c-addr1 file-id -- c-addr2 )
 \ reads the contents of the file file-id puts it into memory at c-addr1  \ reads the contents of the file file-id puts it into memory at c-addr1
Line 36  maxchar 1+ constant eof-char Line 59  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 45  maxchar 1+ constant eof-char Line 68  maxchar 1+ constant eof-char
   
 variable input \ pointer to next character to be parsed  variable input \ pointer to next character to be parsed
 variable endinput \ pointer to the end of the input (the char after the last)  variable endinput \ pointer to the end of the input (the char after the last)
   variable line \ line number of char pointed to by input
   1 line !
   2variable filename \ filename of original input file
   0 0 filename 2!
   variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
   skipsynclines on 
   \ !! unfortunately, this does not mean that they do not appear in the
   \ output. This could be changed by copying the input (skipping
   \ synclines) in ?nextchar
   
 : start ( -- addr )  : start ( -- addr )
  input @ ;   input @ ;
Line 87  variable effect-in-end ( pointer ) Line 119  variable effect-in-end ( pointer )
 variable effect-out-end ( pointer )  variable effect-out-end ( pointer )
 2variable effect-in-size  2variable effect-in-size
 2variable effect-out-size  2variable effect-out-size
   variable c-line
   2variable c-filename
   variable name-line
   2variable name-filename
   2variable last-name-filename
   
 variable primitive-number -9 primitive-number !  variable primitive-number -10 primitive-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
 \ since neither forget nor marker are implemented yet, we make a new  \ since neither forget nor marker are implemented yet, we make a new
Line 128  print-token ! Line 165  print-token !
  getinput member? ;   getinput member? ;
 ' testchar? test-vector !  ' testchar? test-vector !
   
   : checksyncline ( -- )
       \ when input points to a newline, check if the next line is a
       \ sync line.  If it is, perform the appropriate actions.
       input @ >r
       s" #line " r@ over compare 0<> if
           rdrop 1 line +! EXIT
       endif
       0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
       dup c@ bl = if
           char+ dup c@ [char] " <> abort" sync line syntax"
           char+ dup 100 [char] " scan drop swap 2dup - filename 2!
           char+
       endif
       dup c@ nl-char <> abort" sync line syntax"
       skipsynclines @ if
           dup char+ input !
       endif
       drop ;
   
 : ?nextchar ( f -- )  : ?nextchar ( f -- )
  ?not? if      ?not? if
    ." syntax error" cr          ." syntax error" cr
    getinput . cr          getinput . cr
    input @ endinput @ over - 100 min type cr          input @ endinput @ over - 100 min type cr
    abort          abort
  endif      endif
  input @ endinput @ <> if      input @ endinput @ <> if
    1 input +!          input @ c@
  endif ;          1 input +!
           nl-char = if
               checksyncline
           endif
       endif ;
   
 : charclass ( set "name" -- )  : charclass ( set "name" -- )
  ['] ?nextchar terminal ;   ['] ?nextchar terminal ;
Line 174  nowhite ++ Line 234  nowhite ++
 (( ` \ nonl ** nl  (( ` \ nonl ** nl
 )) <- comment ( -- )  )) <- comment ( -- )
   
   \ (( ` # ` l ` i ` n ` e blank
   \ {{ 0. start }} digit ++ {{ end >number abort" line number?" drop drop 1- line ! }} blank
   \    (( ` " {{ start }} noquote ++ {{ end filename 2! }} `" )) ??
   \    nl
   \ )) <- syncline ( -- )
   
   \ (( nl syncline ?? )) <- nlsync
   
 (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}  (( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-in-end ! }}
    ` - ` - blank **     ` - ` - blank **
    {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}     {{ effect-out }} (( {{ start }} c-name {{ end 2 pick item-name 2! item-descr + }} blank ** )) ** {{ effect-out-end ! }}
Line 181  nowhite ++ Line 249  nowhite ++
   
 (( {{ s" " doc 2! s" " forth-code 2! }}  (( {{ s" " doc 2! s" " forth-code 2! }}
    (( comment || nl )) **     (( comment || nl )) **
    (( {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++     (( {{ line @ name-line ! filename 2@ name-filename 2! }}
         {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  tab ++
       {{ start }} stack-effect {{ end stack-string 2! }} tab ++        {{ start }} stack-effect {{ end stack-string 2! }} tab ++
         {{ start }} name {{ end wordset 2! }} tab **          {{ start }} name {{ end wordset 2! }} tab **
         (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl          (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
    ))     ))
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
    {{ start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! }}     {{ line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! }}
    (( ` :  nl     (( ` :  nl
       {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}        {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
    )) ??     )) ??
Line 208  warnings @ [IF] Line 277  warnings @ [IF]
  dup endinput !   dup endinput !
  here - allot   here - allot
  align   align
    checksyncline
  primitives2something ;   primitives2something ;
   
 \ types  \ types
Line 240  constant type-description Line 310  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 264  constant type-description Line 337  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 312  constant type-description Line 383  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 347  constant type-description Line 416  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 406  set-current Line 475  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 428  set-current Line 497  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 479  set-current Line 551  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 506  set-current Line 575  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
    ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
  c-code 2@ type   c-code 2@ type
  ." }" cr   ." }" cr
  ." NEXT_P1;" cr   ." NEXT_P1;" cr
Line 535  set-current Line 611  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 ;
   
   : output-tag-file ( -- )
       name-filename 2@ last-name-filename 2@ compare if
           name-filename 2@ last-name-filename 2!
           #ff emit cr
           name-filename 2@ type
           ." ,0" cr
       endif ;
   
   : output-tag ( -- )
       output-tag-file
       forth-name 2@ 1+ type
       127 emit
       space forth-name 2@ type space
       1 emit
       name-line @ 0 .r
       ." ,0" cr ;
   
   [IFDEF] documentation
   : register-doc ( -- )
       get-current documentation set-current
       forth-name 2@ nextname create
       forth-name 2@ 2,
       stack-string 2@ condition-stack-effect 2,
       wordset 2@ 2,
       c-name 2@ condition-pronounciation 2,
       doc 2@ 2,
       set-current ;
   [THEN]
   
 : process-file ( addr u xt -- )  : process-file ( addr u xt -- )
  >r r/o open-file      >r
  if      2dup filename 2!
    ." cannot open file" cr abort      r/o open-file abort" cannot open file"
  endif      warnings @ if
  warnings @ if          ." ------------ CUT HERE -------------" cr  endif
  ." ------------ CUT HERE -------------" cr  endif      r> primfilter ;
  r> primfilter ;  
   

Removed from v.1.7  
changed lines
  Added in v.1.17


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