--- gforth/fi2c.fs	1998/12/20 23:17:54	1.5
+++ gforth/fi2c.fs	2002/09/14 08:20:19	1.12
@@ -1,6 +1,6 @@
 \ Convert image to C include file
 
-\ Copyright (C) 1998 Free Software Foundation, Inc.
+\ Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ 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.
 
 0 Value image
 0 Value bitmap
@@ -26,6 +26,7 @@ Create magicbuf 8 allot
 Variable bswap?
 Variable tchars
 Variable tcell
+Variable au
 
 : bswap ( n -- n' )  bswap? @ 0= ?EXIT  0
     over 24 rshift $FF       and or
@@ -35,11 +36,14 @@ Variable tcell
 
 : search-magic ( fd -- )  >r
     BEGIN  magicbuf 8 r@ read-file throw  8 =  WHILE
-	magicbuf s" Gforth" tuck compare 0=  UNTIL
+	magicbuf s" Gforth2" 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=
+    [ 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
@@ -48,8 +52,8 @@ 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-header 2 cells + @ bswap tchars @ * tcell @ / au @ /
+    dup image-cells ! 1- 8 / tchars @ / 1+ bitmap-chars !
     image-cells @ cells allocate throw to image
     bitmap-chars @ allocate throw to bitmap ;
 
@@ -57,7 +61,7 @@ Variable bitmap-chars
     image image-cells @ cells 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 ;
@@ -68,7 +72,7 @@ Variable bitmap-chars
 	4 +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,10 +85,10 @@ 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 cells + @ tchars @ * tcell @ / au @ / bswap .08x ;
 
 : .relocsize ( -- )
-    bitmap-chars @ 1- tchars @ / 1+ .08x ;
+    bitmap-chars @ .08x ;
 
 : fi2c ( addr u -- )  base @ >r hex
     read-image