--- gforth/comp-i.fs	2004/12/31 13:23:56	1.16
+++ gforth/comp-i.fs	2010/05/12 20:13:33	1.20
@@ -1,12 +1,12 @@
 \ Compare nonrelocatable images and produce a relocatable image
 
-\ Copyright (C) 1996,1997,1998,2002,2003,2004 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
@@ -78,26 +77,12 @@ s" address-unit-bits" environment? drop
 	    coffset 0<> cell1 coffset + cell2 = and
 	    if
 		cell1 cbase - 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 $4000 xor file-id write-cell throw
 		i reloc-bits set-bit
 	    else
 		xoffset 0<> cell1 xoffset + cell2 = and
 		if
 		    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