Diff for /gforth/prims2x.fs between versions 1.161 and 1.175

version 1.161, 2006/01/27 10:43:52 version 1.175, 2011/12/31 15:29:25
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,2003,2004,2005 Free Software Foundation, Inc.  \ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2009,2010,2011 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, 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).
Line 55 Line 54
 \ for backwards compatibility, jaw  \ for backwards compatibility, jaw
 require compat/strcomp.fs  require compat/strcomp.fs
   
   [undefined] outfile-execute [if]
       : outfile-execute ( ... xt file-id -- ... )
           \ unsafe replacement
           outfile-id >r to outfile-id execute r> to outfile-id ;
   [then]
   
 warnings off  warnings off
   
 \ redefinitions of kernel words not present in gforth-0.6.1  \ redefinitions of kernel words not present in gforth-0.6.1
Line 138  $12340000 immarg ! Line 143  $12340000 immarg !
     over - type cr      over - type cr
     line-start @ rawinput @ over - typewhite ." ^" cr ;      line-start @ rawinput @ over - typewhite ." ^" cr ;
   
   : print-error { addr u -- }
       filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
       print-error-line ;
   
 : ?print-error { f addr u -- }  : ?print-error { f addr u -- }
     f ?not? if      f ?not? if
         outfile-id >r try          addr u ['] print-error stderr outfile-execute
             stderr to outfile-id  
             filename 2@ type ." :" line @ 0 .r ." : " addr u type cr  
             print-error-line  
             0  
         recover endtry  
         r> to outfile-id throw  
         1 (bye) \ abort          1 (bye) \ abort
     endif ;      endif ;
   
Line 367  variable name-line Line 370  variable name-line
 2variable last-name-filename  2variable last-name-filename
 Variable function-number 0 function-number !  Variable function-number 0 function-number !
 Variable function-old 0 function-old !  Variable function-old 0 function-old !
 : function-diff ( n -- )  : function-diff ( -- )
     ." GROUPADD(" function-number @ function-old @ - 0 .r ." )" cr      ." GROUPADD(" function-number @ function-old @ - 0 .r ." )" cr
     function-number @ function-old ! ;      function-number @ function-old ! ;
 : forth-fdiff ( -- )  : forth-fdiff ( -- )
Line 505  defer inst-stream-f ( -- stack ) Line 508  defer inst-stream-f ( -- stack )
     ." vm_two"      ." vm_two"
     r@ item-stack-type-name type ." 2"      r@ item-stack-type-name type ." 2"
     r@ item-type @ print-type-prefix ." ("      r@ item-type @ print-type-prefix ." ("
     r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-read      r@ item-in-index r@ item-stack @ 2dup stack-read
     ." , "                      -1 under+ ." (Cell)" stack-read      ." , "                      -1 under+ stack-read
     ." , " r@ item-name 2@ type      ." , " r@ item-name 2@ type
     ." )" cr      ." )" cr
     rdrop ;      rdrop ;
Line 681  get-current prefixes set-current Line 684  get-current prefixes set-current
 set-current  set-current
   
 create ...-item ( -- addr ) \ just used for letting stack-prefixes work on it  create ...-item ( -- addr ) \ just used for letting stack-prefixes work on it
 item% %allot                \ stores the stack temporarily until used by ...  item% %allot drop           \ stores the stack temporarily until used by ...
   
 : init-item1 ( addr1 addr u -- addr2 )  : init-item1 ( addr1 addr u -- addr2 )
     \ initialize item at addr1 with name addr u, next item is at addr2      \ initialize item at addr1 with name addr u, next item is at addr2
Line 918  stack inst-stream IP Cell Line 921  stack inst-stream IP Cell
 : stack-pointer-update { stack -- }  : stack-pointer-update { stack -- }
     \ and moves      \ and moves
     \ stacks grow downwards      \ stacks grow downwards
   \    ." /* stack pointer update " stack stack-pointer 2@ type ."  */" cr
     stack stack-prim-stacks-sync @ if      stack stack-prim-stacks-sync @ if
   \       ." /* synced "  stack stack-in ? stack stack-out ? stack state-in  stack-offset . ." */" cr
         stack stack-in @          stack stack-in @
         stack state-in  stack-offset -          stack state-in  stack-offset -
         stack swap update-stack-pointer          stack swap update-stack-pointer
     else      else
   \       ." /* unsynced "  stack stack-in ? stack stack-out ? ." */" cr
         stack stack-diff ( in-out )          stack stack-diff ( in-out )
         stack state-in  stack-offset -          stack state-in  stack-offset -
         stack state-out stack-offset + ( [in-in_offset]-[out-out_offset] )          stack state-out stack-offset + ( [in-in_offset]-[out-out_offset] )
Line 934  stack inst-stream IP Cell Line 940  stack inst-stream IP Cell
     ['] stack-pointer-update map-stacks ;      ['] stack-pointer-update map-stacks ;
   
 : stack-pointer-update2 { stack -- }  : stack-pointer-update2 { stack -- }
   \    ." /* stack pointer update2 " stack stack-pointer 2@ type ."  */" cr
     stack stack-prim-stacks-sync @ if      stack stack-prim-stacks-sync @ if
         stack state-out stack-offset          stack state-out stack-offset
         stack stack-out @ -          stack stack-out @ -
Line 1050  variable tail-nextp2 \ xt to execute for Line 1057  variable tail-nextp2 \ xt to execute for
     tail-nextp2 @ output-c-tail1-no-stores ;      tail-nextp2 @ output-c-tail1-no-stores ;
   
 : output-c-tail2-no-stores ( -- )  : output-c-tail2-no-stores ( -- )
       prim prim-c-code 2@ s" VM_JUMP(" search nip nip abort" Currently VM_JUMP is not supported in static superinstructions"
     ['] output-label2 output-c-tail1-no-stores ;      ['] output-label2 output-c-tail1-no-stores ;
   
 : type-c-code ( c-addr u xt -- )  : type-c-code ( c-addr u xt -- )
Line 1345  is output-c-prim-num Line 1353  is output-c-prim-num
 \  NEXT_P2;  \  NEXT_P2;
   
 : init-combined ( -- )  : init-combined ( -- )
       ['] clear-prim-stacks-sync map-stacks
     prim to combined      prim to combined
     0 num-combined !      0 num-combined !
     current-depth max-stacks cells erase      current-depth max-stacks cells erase
Line 1552  variable reprocessed-num 0 reprocessed-n Line 1561  variable reprocessed-num 0 reprocessed-n
     stores ;      stores ;
   
 : output-combined-tail ( -- )  : output-combined-tail ( -- )
     part-output-c-tail  
     in-part @ >r in-part off      in-part @ >r in-part off
       part-output-c-tail
     combined ['] output-c-tail-no-stores prim-context      combined ['] output-c-tail-no-stores prim-context
     r> in-part ! ;      r> in-part ! ;
   
Line 1851  Variable c-flag Line 1860  Variable c-flag
 )) <- else-comment  )) <- else-comment
   
 (( ` + {{ start }} nonl ** {{ end  (( ` + {{ start }} nonl ** {{ end
         dup          dup
         IF      c-flag @          IF
             IF              c-flag @ IF
                 function-diff                  function-diff
                 ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr                  ." #ifdef HAS_" 2dup bounds ?DO  I c@ toupper emit  LOOP cr
                 THEN              THEN
                 forth-flag @              forth-flag @ IF
                 IF  forth-fdiff  ." has? " type ."  [IF]"  cr THEN                  forth-fdiff  ." has? " 2dup type ."  [IF]"  cr
         ELSE    2drop              THEN
               2drop
           ELSE
               2drop
             c-flag @      IF              c-flag @      IF
                 function-diff  ." #endif" cr THEN                  function-diff  ." #endif" cr THEN
             forth-flag @  IF  forth-fdiff  ." [THEN]"  cr THEN              forth-flag @  IF  forth-fdiff  ." [THEN]"  cr THEN
Line 1868  Variable c-flag Line 1880  Variable c-flag
   
 (( (( ` g || ` G )) {{ start }} nonl **  (( (( ` g || ` G )) {{ start }} nonl **
    {{ end     {{ end
       forth-flag @ IF  forth-fdiff  ." group " type cr  THEN        forth-flag @ IF  forth-fdiff  ." group " 2dup type cr  THEN
       c-flag @     IF  function-diff        c-flag @     IF  function-diff
           ." GROUP(" type ." , " function-number @ 0 .r ." )" cr  THEN }}            ." GROUP(" 2dup type ." , " function-number @ 0 .r ." )" cr  THEN
         2drop }}
 )) <- 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 1888  Variable c-flag Line 1901  Variable c-flag
 (( {{ prim create-prim prim init-simple }}  (( {{ prim create-prim prim init-simple }}
    ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **     ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
    (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **     (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       (( {{ start }}  c-ident {{ end 2dup prim-c-name-2! }} )) ??        (( {{ start }}  c-ident {{ end prim-c-name-2! }} )) ??
    )) ??  nleof     )) ??  nleof
    (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??     (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
    {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }}     {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }}

Removed from v.1.161  
changed lines
  Added in v.1.175


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