--- gforth/comp-i.fs	2002/12/28 17:18:26	1.11
+++ gforth/comp-i.fs	2007/09/29 22:20:02	1.17
@@ -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 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
@@ -43,22 +43,18 @@ s" address-unit-bits" environment? drop
     if
 	." : images have the same base address; producing only a data-relocatable image" cr
     else
-	offset abs expected-offset <> abort" images produced by different engines"
+	\ 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 ;
 
-Create tag-offsets
-include kernel/groups.fs
-tag-offsets $20 cells + here tuck - dup allot erase
-
 : >tag ( index -- tag )
-    dup dodoes-tag 2 + > IF  dodoes-tag 2 + -
+    dup dodoes-tag 2 + > IF
 	$21 1 DO  dup tag-offsets I cells + @ < IF
-		tag-offsets I 1- cells + @ - I 9 lshift + negate
+		tag-offsets I 1- cells + @ - I 1- 9 lshift + negate
 		UNLOOP  EXIT  THEN  LOOP
-	dodoes-tag 2 + +
     THEN  -2 swap - ;
 
 : compare-images { image1 image2 reloc-bits size file-id -- }