Diff for /gforth/comp-i.fs between versions 1.20 and 1.25

version 1.20, 2010/05/12 20:13:33 version 1.25, 2012/07/23 14:46:31
Line 1 Line 1
 \ Compare nonrelocatable images and produce a relocatable image  \ 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.  \ This file is part of Gforth.
   
Line 24  s" address-unit-bits" environment? drop Line 24  s" address-unit-bits" environment? drop
     \ write a cell to the file      \ write a cell to the file
     w cell file-id write-file ;      w cell file-id write-file ;
   
 : th ( addr1 n -- addr2 )  
     cells + ;  
   
 : bset ( bmask c-addr -- )  : bset ( bmask c-addr -- )
     tuck c@ or swap c! ;       tuck c@ or swap c! ; 
   
Line 65  s" address-unit-bits" environment? drop Line 62  s" address-unit-bits" environment? drop
     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
     ." code" image1 image2 cell     26 cells image-data { cbase coffset }      ." 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      size 0
     u+do      u+do
         image1 i th @ image2 i th @ { cell1 cell2 }          image1 i th @ image2 i th @ { cell1 cell2 }
Line 98  s" address-unit-bits" environment? drop Line 95  s" address-unit-bits" environment? drop
   
 : 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" Gforth3" search 0= abort" not a Gforth image"      image1 size1 s" Gforth4" 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"
     image1 header-offset + 2 cells + @ header-offset + size1 <> abort" header gives wrong size"      image1 header-offset + 2 cells + @ header-offset + size1 <> abort" header gives wrong size"

Removed from v.1.20  
changed lines
  Added in v.1.25


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>