Diff for /gforth/comp-i.fs between versions 1.24 and 1.27

version 1.24, 2012/07/23 14:15:51 version 1.27, 2012/12/31 15:25:17
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,2010 Free Software Foundation, Inc.  \ Copyright (C) 1996,1997,1998,2002,2003,2004,2007,2010,2012 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 62  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 12 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 73  s" address-unit-bits" environment? drop Line 73  s" address-unit-bits" environment? drop
         else          else
             coffset 0<> cell1 coffset + cell2 = and              coffset 0<> cell1 coffset + cell2 = and
             if              if
                 cell1 cbase - cell / { tag }                  cell1 cbase - cell/ { tag }
                 tag >tag $4000 xor file-id write-cell throw                  tag >tag $4000 xor file-id write-cell throw
                 i reloc-bits set-bit                  i reloc-bits set-bit
             else              else
                 xoffset 0<> cell1 xoffset + cell2 = and                  xoffset 0<> cell1 xoffset + cell2 = and
                 if                  if
                     cell1 xbase - cell / { tag }                      cell1 xbase - cell/ { tag }
                     tag >tag file-id write-cell throw                      tag >tag file-id write-cell throw
                     i reloc-bits set-bit                      i reloc-bits set-bit
                 else                  else
Line 102  s" address-unit-bits" environment? drop Line 102  s" address-unit-bits" environment? drop
     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 }
     size1 header-offset - 1- cell / bits/au / 1+ { reloc-size }      size1 header-offset - 1- cell/ bits/au / 1+ { reloc-size }
     reloc-size allocate throw { reloc-bits }      reloc-size allocate throw { reloc-bits }
     reloc-bits reloc-size erase      reloc-bits reloc-size erase
     image1 header-offset outfile write-file throw      image1 header-offset outfile write-file throw
     base @ hex      base @ hex
     image1 header-offset +  image2 header-offset +  reloc-bits      image1 header-offset +  image2 header-offset +  reloc-bits
     size1 header-offset - aligned cell /  outfile  compare-images      size1 header-offset - aligned cell/  outfile  compare-images
     base !      base !
     reloc-bits reloc-size outfile write-file throw      reloc-bits reloc-size outfile write-file throw
     outfile close-file throw ;      outfile close-file throw ;

Removed from v.1.24  
changed lines
  Added in v.1.27


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