| >r 1 bits/au 1- rot - lshift |
>r 1 bits/au 1- rot - lshift |
| r> addr + bset ; |
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. |
| \G offset is the difference for relocated addresses |
\G offset is the difference for relocated addresses |
| 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 } |
| 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 doffset + negate image2 i 1+ th +! |
| |
endif |
| |
-2 tag $4000 or - 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 negate image1 i 1+ th +! |
| dbase doffset + negate image2 i 1+ th +! |
dbase doffset + negate image2 i 1+ th +! |
| endif |
endif |
| endif |
endif |
| endif |
endif |
| endif |
endif |
| |
endif |
| loop ; |
loop ; |
| |
|
| : comp-image ( "image-file1" "image-file2" "new-image" -- ) |
: comp-image ( "image-file1" "image-file2" "new-image" -- ) |
| image1 size1 s" Gforth2" search 0= abort" not a Gforth image" |
image1 size1 s" Gforth2" 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 } |
