--- gforth/comp-i.fs 1997/05/21 20:39:19 1.1 +++ gforth/comp-i.fs 1998/12/22 15:18:49 1.4 @@ -1,6 +1,6 @@ \ Compare nonrelocatable images and produce a relocatable image -\ Copyright (C) 1996-1997 Free Software Foundation, Inc. +\ Copyright (C) 1996,1997,1998 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -47,7 +47,7 @@ s" address-unit-bits" environment? drop if ." images have the same code base address; producing only a data-relocatable image" cr else - coffset abs 11 cells <> abort" images produced by different engines" + coffset abs 22 cells <> abort" images produced by different engines" ." code offset=" coffset . cr 0 image1 cell+ ! 0 image2 cell+ ! endif @@ -90,7 +90,7 @@ s" address-unit-bits" environment? drop : comp-image ( "image-file1" "image-file2" "new-image" -- ) name slurp-file { image1 size1 } - image1 size1 s" Gforth1" search 0= abort" not a Gforth image" + image1 size1 s" Gforth2" search 0= abort" not a Gforth image" drop 8 + image1 - { header-offset } size1 aligned size1 <> abort" unaligned image size" size1 image1 header-offset + 2 cells + @ header-offset + <> abort" header gives wrong size"