--- gforth/comp-i.fs	2003/03/09 15:16:46	1.12
+++ gforth/comp-i.fs	2007/12/31 18:40:23	1.19
@@ -1,12 +1,12 @@
 \ Compare nonrelocatable images and produce a relocatable image
 
-\ Copyright (C) 1996,1997,1998,2002 Free Software Foundation, Inc.
+\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,11 +15,10 @@
 \ GNU General Public License for more details.
 
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 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 +42,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 -- }