version 1.3, 1998/12/08 22:02:36
|
version 1.10, 2002/12/27 17:19:33
|
Line 16
|
Line 16
|
|
|
\ You should have received a copy of the GNU General Public License |
\ You should have received a copy of the GNU General Public License |
\ along with this program; if not, write to the Free Software |
\ along with this program; if not, write to the Free Software |
\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. |
|
|
s" address-unit-bits" environment? drop constant bits/au |
s" address-unit-bits" environment? drop constant bits/au |
6 constant dodoes-tag |
6 constant dodoes-tag |
Line 28 s" address-unit-bits" environment? drop
|
Line 28 s" address-unit-bits" environment? drop
|
: th ( addr1 n -- addr2 ) |
: th ( addr1 n -- addr2 ) |
cells + ; |
cells + ; |
|
|
|
: bset ( bmask c-addr -- ) |
|
tuck c@ or swap c! ; |
|
|
: set-bit { u addr -- } |
: set-bit { u addr -- } |
\ set bit u in bit-vector addr |
\ set bit u in bit-vector addr |
u bits/au /mod |
u bits/au /mod |
>r 1 bits/au 1- rot - lshift |
>r 1 bits/au 1- rot - lshift |
r> addr + cset ; |
r> addr + bset ; |
|
|
|
: image-data { image1 image2 i-field expected-offset -- base offset } |
|
image1 i-field + @ image2 i-field + @ over - { base offset } |
|
offset 0= |
|
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" |
|
." offset=" offset . cr |
|
0 image1 i-field + ! 0 image2 i-field + ! |
|
endif |
|
base offset ; |
|
|
|
|
: compare-images { image1 image2 reloc-bits size file-id -- } |
: compare-images { image1 image2 reloc-bits size file-id -- } |
\G compares image1 and image2 (of size cells) and sets reloc-bits. |
\G compares image1 and image2 (of size cells) and sets reloc-bits. |
Line 42 s" address-unit-bits" environment? drop
|
Line 58 s" address-unit-bits" environment? drop
|
image1 @ image2 @ over - { dbase doffset } |
image1 @ image2 @ over - { dbase doffset } |
doffset 0= abort" images have the same dictionary base address" |
doffset 0= abort" images have the same dictionary base address" |
." data offset=" doffset . cr |
." data offset=" doffset . cr |
image1 cell+ @ image2 cell+ @ over - { cbase coffset } |
." code" image1 image2 cell 26 cells image-data { cbase coffset } |
coffset 0= |
." xt" image1 image2 11 cells 22 cells image-data { xbase xoffset } |
if |
|
." images have the same code base address; producing only a data-relocatable image" cr |
|
else |
|
coffset abs 22 cells <> abort" images produced by different engines" |
|
." code offset=" coffset . cr |
|
0 image1 cell+ ! 0 image2 cell+ ! |
|
endif |
|
size 0 |
size 0 |
u+do |
u+do |
image1 i th @ image2 i th @ { cell1 cell2 } |
image1 i th @ image2 i th @ { cell1 cell2 } |
Line 65 s" address-unit-bits" environment? drop
|
Line 74 s" address-unit-bits" environment? drop
|
tag dodoes-tag = |
tag dodoes-tag = |
if |
if |
\ make sure that the next cell will not be tagged |
\ 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 negate image1 i 1+ th +! |
dbase doffset + negate image2 i 1+ th +! |
dbase doffset + negate image2 i 1+ th +! |
endif |
endif |
-2 tag - file-id write-cell throw |
-2 tag $4000 or - file-id write-cell throw |
i reloc-bits set-bit |
i reloc-bits set-bit |
else |
else |
cell1 file-id write-cell throw |
xoffset 0<> cell1 xoffset + cell2 = and |
cell1 cell2 <> |
|
if |
if |
0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr |
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 |
|
-2 tag - file-id write-cell throw |
|
i reloc-bits set-bit |
|
else |
|
cell1 file-id write-cell throw |
|
cell1 cell2 <> |
|
if |
|
0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr |
|
endif |
endif |
endif |
endif |
endif |
endif |
endif |
loop ; |
loop ; |
|
|
: slurp-file ( c-addr1 u1 -- c-addr2 u2 ) |
|
\ c-addr1 u1 is the filename, c-addr2 u2 is the file's contents |
|
r/o bin open-file throw >r |
|
r@ file-size throw abort" file too large" |
|
dup allocate throw swap |
|
2dup r@ read-file throw over <> abort" could not read whole file" |
|
r> close-file throw ; |
|
|
|
: comp-image ( "image-file1" "image-file2" "new-image" -- ) |
: comp-image ( "image-file1" "image-file2" "new-image" -- ) |
name slurp-file { image1 size1 } |
name slurp-file { image1 size1 } |
image1 size1 s" Gforth1" search 0= abort" not a Gforth image" |
image1 size1 s" Gforth3" search 0= abort" not a Gforth image" |
drop 8 + image1 - { header-offset } |
drop 8 + image1 - { header-offset } |
size1 aligned size1 <> abort" unaligned image size" |
size1 aligned size1 <> abort" unaligned image size" |
size1 image1 header-offset + 2 cells + @ header-offset + <> abort" header gives wrong size" |
image1 header-offset + 2 cells + @ header-offset + size1 <> abort" header gives wrong size" |
name slurp-file { image2 size2 } |
name slurp-file { image2 size2 } |
size1 size2 <> abort" image sizes differ" |
size1 size2 <> abort" image sizes differ" |
name ( "new-image" ) w/o bin create-file throw { outfile } |
name ( "new-image" ) w/o bin create-file throw { outfile } |