--- gforth/comp-i.fs	2001/01/19 21:07:05	1.6
+++ gforth/comp-i.fs	2007/12/31 17:34:58	1.18
@@ -1,6 +1,6 @@
 \ Compare nonrelocatable images and produce a relocatable image
 
-\ Copyright (C) 1996,1997,1998 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -19,7 +19,7 @@
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 s" address-unit-bits" environment? drop constant bits/au
-6 constant dodoes-tag
+7 constant dodoes-tag
 
 : write-cell { w^ w  file-id -- ior }
     \ write a cell to the file
@@ -28,11 +28,34 @@ s" address-unit-bits" environment? drop
 : th ( addr1 n -- addr2 )
     cells + ;
 
+: bset ( bmask c-addr -- )
+    tuck c@ or swap c! ; 
+
 : set-bit { u addr -- }
     \ set bit u in bit-vector addr
     u bits/au /mod
     >r 1 bits/au 1- rot - lshift
-    r> addr +  cset ;
+    r> addr +  bset ;
+
+: image-data { image1 image2 i-field expected-offset -- base offset }
+    image1 i-field + @ image2 i-field + @ over - { base offset }
+    offset 0=
+    if
+	." : images have the same base address; producing only a data-relocatable image" cr
+    else
+	\ the following sanity check produces false positices with exec-shield
+	\ offset abs expected-offset <> abort" images produced by different engines"
+	."  offset=" offset . cr
+	0 image1 i-field + ! 0 image2 i-field + !
+    endif
+    base offset ;
+
+: >tag ( index -- tag )
+    dup dodoes-tag 2 + > IF
+	$21 1 DO  dup tag-offsets I cells + @ < IF
+		tag-offsets I 1- cells + @ - I 1- 9 lshift + negate
+		UNLOOP  EXIT  THEN  LOOP
+    THEN  -2 swap - ;
 
 : compare-images { image1 image2 reloc-bits size file-id -- }
     \G compares image1 and image2 (of size cells) and sets reloc-bits.
@@ -42,15 +65,8 @@ s" address-unit-bits" environment? drop
     image1 @ image2 @ over - { dbase doffset }
     doffset 0= abort" images have the same dictionary base address"
     ." data offset=" doffset . cr
-    image1 cell+ @ image2 cell+ @ over - { cbase coffset }
-    coffset 0=
-    if
-	." images have the same code base address; producing only a data-relocatable image" cr
-    else
-	coffset abs 22 cells <> abort" images produced by different engines"
-	." code offset=" coffset . cr
-	0 image1 cell+ ! 0 image2 cell+ !
-    endif
+    ." code" image1 image2 cell     26 cells image-data { cbase coffset }
+    ."   xt" image1 image2 11 cells 22 cells image-data { xbase xoffset }
     size 0
     u+do
 	image1 i th @ image2 i th @ { cell1 cell2 }
@@ -65,16 +81,31 @@ s" address-unit-bits" environment? drop
 		tag dodoes-tag =
 		if
 		    \ make sure that the next cell will not be tagged
+		    \ !! can probably be optimized away with hybrid threading
 		    dbase negate image1 i 1+ th +!
 		    dbase doffset + negate image2 i 1+ th +!
 		endif
-		-2 tag - file-id write-cell throw
+		tag >tag $4000 xor file-id write-cell throw
 		i reloc-bits set-bit
 	    else
-		cell1 file-id write-cell throw
-		cell1 cell2 <>
+		xoffset 0<> cell1 xoffset + cell2 = and
 		if
-		    0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr
+		    cell1 xbase - cell / { tag }
+		    tag dodoes-tag =
+		    if
+			\ make sure that the next cell will not be tagged
+			\ !! can probably be optimized away with hybrid threading
+			dbase negate image1 i 1+ th +!
+			dbase doffset + negate image2 i 1+ th +!
+		    endif
+		    tag >tag file-id write-cell throw
+		    i reloc-bits set-bit
+		else
+		    cell1 file-id write-cell throw
+		    cell1 cell2 <>
+		    if
+			0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr
+		    endif
 		endif
 	    endif
 	endif
@@ -82,10 +113,10 @@ s" address-unit-bits" environment? drop
 
 : comp-image ( "image-file1" "image-file2" "new-image" -- )
     name slurp-file { image1 size1 }
-    image1 size1 s" Gforth2" search 0= abort" not a Gforth image"
+    image1 size1 s" Gforth3" search 0= abort" not a Gforth image"
     drop 8 + image1 - { header-offset }
     size1 aligned size1 <> abort" unaligned image size"
-    size1 image1 header-offset + 2 cells + @ header-offset + <> abort" header gives wrong size"
+    image1 header-offset + 2 cells + @ header-offset + size1 <> abort" header gives wrong size"
     name slurp-file { image2 size2 }
     size1 size2 <> abort" image sizes differ"
     name ( "new-image" ) w/o bin create-file throw { outfile }