--- gforth/comp-i.fs 2010/05/12 20:13:33 1.20 +++ gforth/comp-i.fs 2012/07/23 14:46:31 1.25 @@ -1,6 +1,6 @@ \ Compare nonrelocatable images and produce a relocatable image -\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007 Free Software Foundation, Inc. +\ Copyright (C) 1996,1997,1998,2002,2003,2004,2007,2010 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -24,9 +24,6 @@ s" address-unit-bits" environment? drop \ write a cell to the file w cell file-id write-file ; -: th ( addr1 n -- addr2 ) - cells + ; - : bset ( bmask c-addr -- ) tuck c@ or swap c! ; @@ -65,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 11 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 } @@ -98,7 +95,7 @@ s" address-unit-bits" environment? drop : comp-image ( "image-file1" "image-file2" "new-image" -- ) name slurp-file { image1 size1 } - image1 size1 s" Gforth3" search 0= abort" not a Gforth image" + image1 size1 s" Gforth4" search 0= abort" not a Gforth image" drop 8 + image1 - { header-offset } size1 aligned size1 <> abort" unaligned image size" image1 header-offset + 2 cells + @ header-offset + size1 <> abort" header gives wrong size"