--- gforth/prims2x.fs	2000/11/12 18:14:09	1.51
+++ gforth/prims2x.fs	2000/12/13 10:15:26	1.54
@@ -87,34 +87,50 @@ variable output \ xt ( -- ) of output wo
 : printprim ( -- )
  output @ execute ;
 
-\ stack types
-
 struct%
     cell% 2* field stack-pointer \ stackpointer name
     cell% 2* field stack-cast \ cast string for assignments to stack elements
+    cell%    field stack-in-index-xt \ ( in-size item -- in-index )
     cell%    field stack-in  \ number of stack items in effect in
     cell%    field stack-out \ number of stack items in effect out
 end-struct stack%
 
+struct%
+ cell% 2* field item-name   \ name, excluding stack prefixes
+ cell%    field item-stack  \ descriptor for the stack used, 0 is default
+ cell%    field item-type   \ descriptor for the item type
+ cell%    field item-offset \ offset in stack items, 0 for the deepest element
+end-struct item%
+
+struct%
+    cell% 2* field type-c-name
+    cell%    field type-stack \ default stack
+    cell%    field type-size  \ size of type in stack items
+    cell%    field type-fetch \ xt of fetch code generator ( item -- )
+    cell%    field type-store \ xt of store code generator ( item -- )
+end-struct type%
+
+: stack-in-index ( in-size item -- in-index )
+    item-offset @ - 1- ;
+
+: inst-in-index ( in-size item -- in-index )
+    nip dup item-offset @ swap item-type @ type-size @ + 1- ;
+
 : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
     create stack% %allot >r
     save-mem r@ stack-cast 2!
-    save-mem r> stack-pointer 2! ;
+    save-mem r@ stack-pointer 2! 
+    ['] stack-in-index r> stack-in-index-xt ! ;
 
 s" sp" save-mem s" (Cell)" make-stack data-stack 
 s" fp" save-mem s" "       make-stack fp-stack
 s" rp" save-mem s" (Cell)" make-stack return-stack
+s" ip" save-mem s" error don't use # on results" make-stack inst-stream
+' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out
 
 \ stack items
 
-struct%
- cell% 2* field item-name   \ name, excluding stack prefixes
- cell%    field item-stack  \ descriptor for the stack used, 0 is default
- cell%    field item-type   \ descriptor for the item type
- cell%    field item-offset \ offset in stack items, 0 for the deepest element
-end-struct item%
-
 : init-item ( addr u addr1 -- )
     \ initialize item at addr1 with name addr u
     \ !! remove stack prefix
@@ -257,6 +273,10 @@ eof-char singleton					charclass eof
 Variable forth-flag
 Variable c-flag
 
+(( (( ` e || ` E )) {{ start }} nonl ** 
+   {{ end evaluate }}
+)) <- eval-comment ( ... -- ... )
+
 (( (( ` f || ` F )) {{ start }} nonl ** 
    {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
 )) <- forth-comment ( -- )
@@ -283,7 +303,7 @@ Variable c-flag
 	THEN }}
 )) <- if-comment
 
-(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
+(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
 
 (( ` \ comment-body nl )) <- comment ( -- )
 
@@ -332,14 +352,6 @@ warnings @ [IF]
 
 \ types
 
-struct%
-    cell% 2* field type-c-name
-    cell%    field type-stack \ default stack
-    cell%    field type-size  \ size of type in stack items
-    cell%    field type-fetch \ xt of fetch code generator ( item -- )
-    cell%    field type-store \ xt of store code generator ( item -- )
-end-struct type%
-
 : stack-access ( n stack -- )
     \ print a stack access at index n of stack
     stack-pointer 2@ type
@@ -350,9 +362,10 @@ end-struct type%
 	drop ." TOS"
     endif ;
 
-: item-in-index ( item -- n )
+: item-in-index { item -- n }
     \ n is the index of item (in the in-effect)
-    >r r@ item-stack @ stack-in @ r> item-offset @ - 1- ;
+    item item-stack @ dup >r stack-in @ ( in-size r:stack )
+    item r> stack-in-index-xt @ execute ;
 
 : fetch-single ( item -- )
  \ fetch a single stack item from its stack
@@ -423,15 +436,11 @@ end-struct type%
  ." );" cr
  rdrop ;
 
+: single ( -- xt1 xt2 n )
+    ['] fetch-single ['] store-single 1 ;
 
-: single-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 data-stack ;
-
-: double-type ( -- xt1 xt2 n stack )
- ['] fetch-double ['] store-double 2 data-stack ;
-
-: float-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 fp-stack ;
+: double ( -- xt1 xt2 n )
+    ['] fetch-double ['] store-double 2 ;
 
 : s, ( addr u -- )
 \ allocate a string
@@ -462,7 +471,7 @@ wordlist constant prefixes
     stack r@ type-stack !
     rdrop ;
 
-: type-prefix ( addr u xt1 xt2 n stack "prefix" -- )
+: type-prefix ( xt1 xt2 n stack "prefix" -- )
     create-type
 does> ( item -- )
     \ initialize item
@@ -510,30 +519,6 @@ does> ( item -- )
  effect-in effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;
 
-get-current
-prefixes set-current
-
-s" Bool"	single-type type-prefix f
-s" Char"	single-type type-prefix c
-s" Cell"	single-type type-prefix n
-s" Cell"	single-type type-prefix w
-s" UCell"	single-type type-prefix u
-s" DCell"	double-type type-prefix d
-s" UDCell"	double-type type-prefix ud
-s" Float"	float-type  type-prefix r
-s" Cell *"	single-type type-prefix a_
-s" Char *"	single-type type-prefix c_
-s" Float *"	single-type type-prefix f_
-s" DFloat *"	single-type type-prefix df_
-s" SFloat *"	single-type type-prefix sf_
-s" Xt"		single-type type-prefix xt
-s" WID"		single-type type-prefix wid
-s" struct F83Name *"	single-type type-prefix f83name
-
-return-stack stack-prefix R:
-
-set-current
-
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -553,11 +538,12 @@ set-current
 : clear-stack { -- }
     dup stack-in off stack-out off ;
 
-
 : compute-offsets ( -- )
     data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
+    inst-stream clear-stack
     effect-in  effect-in-end  @ ['] stack-in  compute-list
-    effect-out effect-out-end @ ['] stack-out compute-list ;
+    effect-out effect-out-end @ ['] stack-out compute-list
+    inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
 
 : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and
@@ -579,6 +565,7 @@ set-current
     endif ;
 
 : fill-tos ( -- )
+    \ !! inst-stream for prefetching?
     fp-stack     fill-a-tos
     data-stack   fill-a-tos
     return-stack fill-a-tos ;
@@ -599,6 +586,7 @@ set-current
     endif ;
 
 : stack-pointer-updates ( -- )
+    inst-stream  stack-pointer-update
     data-stack   stack-pointer-update
     fp-stack     stack-pointer-update
     return-stack stack-pointer-update ;
@@ -613,6 +601,25 @@ set-current
    i store
  item% %size +loop ; 
 
+: output-c-tail ( -- )
+    \ the final part of the generated C code
+    ." NEXT_P1;" cr
+    stores
+    fill-tos
+    ." NEXT_P2;" cr ;
+
+: type-c ( c-addr u -- )
+    \ like TYPE, but replaces "TAIL;" with tail code
+    begin ( c-addr1 u1 )
+	2dup s" TAIL;" search
+    while ( c-addr1 u1 c-addr3 u3 )
+	2dup 2>r drop nip over - type
+	output-c-tail
+	2r> 5 /string
+	\ !! resync #line missing
+    repeat
+    2drop type ;
+
 : output-c ( -- ) 
  ." I_" c-name 2@ type ." :	/* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr
@@ -627,12 +634,9 @@ set-current
  stack-pointer-updates
  ." {" cr
  ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
- c-code 2@ type
+ c-code 2@ type-c
  ." }" cr
- ." NEXT_P1;" cr
- stores
- fill-tos
- ." NEXT_P2;" cr
+ output-c-tail
  ." }" cr
  cr
 ;
@@ -659,6 +663,7 @@ set-current
     ." {" cr
     declarations
     compute-offsets \ for everything else
+    inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
     data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
     fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
     return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN