--- gforth/comp-i.fs 2007/12/31 18:40:23 1.19 +++ gforth/comp-i.fs 2010/05/13 09:39:07 1.21 @@ -77,26 +77,12 @@ s" address-unit-bits" environment? drop coffset 0<> cell1 coffset + cell2 = and if cell1 cbase - 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 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 } - 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 tag >tag file-id write-cell throw i reloc-bits set-bit else @@ -112,7 +98,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"