--- gforth/comp-i.fs 2012/07/23 14:15:51 1.24 +++ gforth/comp-i.fs 2012/12/31 15:25:17 1.27 @@ -1,6 +1,6 @@ \ Compare nonrelocatable images and produce a relocatable image -\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007,2010 Free Software Foundation, Inc. +\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007,2010,2012 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -62,7 +62,7 @@ s" address-unit-bits" environment? drop doffset 0= abort" images have the same dictionary base address" ." data offset=" doffset . cr ." code" image1 image2 cell 26 cells image-data { cbase coffset } - ." xt" image1 image2 12 cells 22 cells image-data { xbase xoffset } + ." xt" image1 image2 13 cells 22 cells image-data { xbase xoffset } size 0 u+do image1 i th @ image2 i th @ { cell1 cell2 } @@ -73,13 +73,13 @@ s" address-unit-bits" environment? drop else coffset 0<> cell1 coffset + cell2 = and if - cell1 cbase - cell / { tag } + cell1 cbase - cell/ { tag } 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 } + cell1 xbase - cell/ { tag } tag >tag file-id write-cell throw i reloc-bits set-bit else @@ -102,13 +102,13 @@ s" address-unit-bits" environment? drop name slurp-file { image2 size2 } size1 size2 <> abort" image sizes differ" name ( "new-image" ) w/o bin create-file throw { outfile } - size1 header-offset - 1- cell / bits/au / 1+ { reloc-size } + size1 header-offset - 1- cell/ bits/au / 1+ { reloc-size } reloc-size allocate throw { reloc-bits } reloc-bits reloc-size erase image1 header-offset outfile write-file throw base @ hex image1 header-offset + image2 header-offset + reloc-bits - size1 header-offset - aligned cell / outfile compare-images + size1 header-offset - aligned cell/ outfile compare-images base ! reloc-bits reloc-size outfile write-file throw outfile close-file throw ;