--- gforth/fi2c.fs	1998/12/13 23:29:58	1.4
+++ gforth/fi2c.fs	2007/02/17 21:04:15	1.15
@@ -1,6 +1,6 @@
 \ Convert image to C include file
 
-\ Copyright (C) 1998 Free Software Foundation, Inc.
+\ Copyright (C) 1998,1999,2002,2003 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,30 +16,83 @@
 
 \ 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.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+
+require string.fs
 
 0 Value image
 0 Value bitmap
 
 Create magicbuf 8 allot
 
+Create groups 32 0 [DO] 512 cells allocate throw dup 512 cells erase , [LOOP]
+
+: prefix? ( string u1 prefix u2 -- flag )
+    tuck 2>r umin 2r> str= ;
+
+: read-groups ( addr u -- )
+    r/o open-file throw >r  0 0
+    BEGIN  pad $100 r@ read-line throw  WHILE
+	    pad swap 2dup s" GROUP(" prefix?
+	    IF  2drop drop 1+ 0  ELSE
+		2dup s" INST_ADDR(" prefix?
+		IF  &10 /string 2dup ') scan nip -
+		    2over cells swap cells groups + @ + $!
+		    1+
+		ELSE  2drop  THEN  THEN
+    REPEAT
+    2drop r> close-file throw ;
+s" prim_lab.i" read-groups
+
 Variable bswap?
+Variable endian
 Variable tchars
 Variable tcell
+Variable au
 
+: t@ ( addr -- x )
+    endian @ IF
+	0 swap tcell @ bounds ?DO
+	    8 lshift I c@ or
+	LOOP
+    ELSE
+	0 swap tcell @ bounds ?DO
+	    8 rshift I c@ 8 tcell @ 1- * lshift or
+	LOOP
+    THEN
+    dup 1 8 tcell @ * 1- lshift and negate or ;
+
+1 cells 4 = [IF]
 : bswap ( n -- n' )  bswap? @ 0= ?EXIT  0
     over 24 rshift $FF       and or
     over  8 rshift $FF00     and or
     over  8 lshift $FF0000   and or
     over 24 lshift $FF000000 and or nip ;
+[THEN]
+
+1 cells 8 = [IF]
+: bswap ( n -- n' )  bswap? @ 0= ?EXIT  0
+    over 56 rshift $FF               and or
+    over 40 rshift $FF00             and or
+    over 24 rshift $FF0000           and or
+    over  8 rshift $FF000000         and or
+    over  8 lshift $FF00000000       and or
+    over 24 lshift $FF0000000000     and or
+    over 40 lshift $FF000000000000   and or
+    over 56 lshift $FF00000000000000 and or
+    nip ;
+[THEN]
 
 : search-magic ( fd -- )  >r
     BEGIN  magicbuf 8 r@ read-file throw  8 =  WHILE
-	magicbuf s" Gforth" tuck compare 0=  UNTIL
+	magicbuf s" Gforth3" tuck str=  UNTIL
     ELSE  true abort" No magic found"  THEN
-    magicbuf 6 + c@ digit? drop tchars !
-    magicbuf 7 + c@ digit? drop dup -2 and tcell !
-    1 and 0= [ pad off 1 pad ! pad c@ 1 = ] Literal = bswap? !
+    1 magicbuf 7 + c@ 5 rshift 3 and lshift tchars !
+    1 magicbuf 7 + c@ 1 rshift 3 and lshift tcell !
+    1 magicbuf 7 + c@ 3 rshift 3 and lshift au !
+    magicbuf 7 + c@ 1 and 0= dup endian !
+    [ pad off 1 pad ! pad c@ 1 = ] Literal = bswap? !
+    ." /* Image with " tcell @ . ." bytes cell, " tchars @ . ." bytes per char and " au @ . ." bytes per address unit */" cr
     rdrop ;
 
 Create image-header  4 cells allot
@@ -47,28 +100,53 @@ Variable image-cells
 Variable bitmap-chars
 
 : read-header ( fd -- )
-    image-header 4 cells rot read-file throw drop
-    image-header 2 cells + @ bswap tchars @ *
-    dup cell / image-cells ! 1- 8 cells / 1+ bitmap-chars !
-    image-cells @ cells allocate throw to image
+    image-header 4 tcell @ * rot read-file throw drop
+    image-header 2 tcell @ * + t@ tchars @ * tcell @ / au @ /
+    dup image-cells ! 1- 8 / tchars @ / 1+ bitmap-chars !
+    image-cells @ tcell @ * allocate throw to image
     bitmap-chars @ allocate throw to bitmap ;
 
 : read-dictionary ( fd -- )  >r
-    image image-cells @ cells r> read-file throw drop ;
+    image image-cells @ tcell @ * r> read-file throw drop ;
 
 : read-bitmap ( fd -- )  >r
-    bitmap bitmap-chars @ r> read-file throw drop ;
+    bitmap bitmap-chars @ tchars @ * r> read-file throw drop ;
 
 : .08x ( n -- ) 0 <# tcell  @ 0 ?DO # # LOOP 'x hold '0 hold #> type ;
 : .02x ( n -- ) 0 <# tchars @ 0 ?DO # # LOOP 'x hold '0 hold #> type ;
 
+: bit@ ( addr n -- flag )
+    dup 7 and $80 swap rshift >r 3 rshift + c@ r> and
+    0<> ;
+
 : .image ( -- )
     image-cells @ 0 ?DO
-	I 4 + I' min I ?DO  space image I cells + @ bswap .08x ." ," LOOP cr
-	4 +LOOP ;
+	I 1 + I' min I ?DO  space image I tcell @ * + t@
+	    bitmap I bit@ IF
+		dup 0< IF
+		    negate dup $3E00 and 9 rshift swap $1FF and
+		    over cells groups + @ over $1FF and cells +
+		    dup @ 0= IF  drop
+			2dup 0 8 d= IF  2drop s" doesjump"
+			ELSE
+			    <# '] hold 0 #S 2drop '[ hold '] hold
+			    0 #S '[ hold #>
+			THEN
+		    ELSE
+			>r 2drop r> $@
+		    THEN
+		    ." &&" type
+		ELSE
+		    ." image+" tcell @ / .08x
+		THEN
+	    ELSE
+		.08x
+	    THEN  ." ,"
+	LOOP cr
+    1 +LOOP ;
 
 : .reloc ( -- )
-    bitmap-chars @ 0 ?DO
+    bitmap-chars @ tchars @ * 0 ?DO
 	I $10 + I' min I ?DO  space
 	    0 I tchars @ bounds ?DO  8 lshift bitmap I + c@ +  LOOP
 	    .02x ." ," tchars @ +LOOP cr
@@ -81,15 +159,15 @@ Variable bitmap-chars
     r@ read-dictionary r@ read-bitmap r> close-file throw ;
 
 : .imagesize ( -- )
-    image-header 3 cells + @ bswap tcell @ / tchars @ * .08x ;
+    image-header 3 tcell @ * + t@ tchars @ * tcell @ / au @ / .08x ;
 
 : .relocsize ( -- )
-    bitmap-chars @ tchars @ / .08x ;
+    bitmap-chars @ .08x ;
 
 : fi2c ( addr u -- )  base @ >r hex
     read-image
     ." #include " '" emit ." forth.h" '" emit cr
-    ." Cell image[" .imagesize ." ] = {" cr .image ." };" cr
+    ." void* image[" .imagesize ." ] = {" cr .image ." };" cr
     ." const char reloc_bits[" .relocsize ." ] = {" cr .reloc ." };" cr
     r> base ! ;