Diff for /gforth/comp-i.fs between versions 1.9 and 1.19

version 1.9, 2002/01/14 08:40:23 version 1.19, 2007/12/31 18:40:23
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 Free Software Foundation, Inc.  \ Copyright (C) 1996,1997,1998,2002,2003,2004,2007 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ 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, see http://www.gnu.org/licenses/.
 \ 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  7 constant dodoes-tag
   
 : write-cell { w^ w  file-id -- ior }  : write-cell { w^ w  file-id -- ior }
     \ write a cell to the file      \ write a cell to the file
Line 43  s" address-unit-bits" environment? drop Line 42  s" address-unit-bits" environment? drop
     if      if
         ." : images have the same base address; producing only a data-relocatable image" cr          ." : images have the same base address; producing only a data-relocatable image" cr
     else      else
         offset abs expected-offset <> abort" images produced by different engines"          \ the following sanity check produces false positices with exec-shield
           \ offset abs expected-offset <> abort" images produced by different engines"
         ."  offset=" offset . cr          ."  offset=" offset . cr
         0 image1 i-field + ! 0 image2 i-field + !          0 image1 i-field + ! 0 image2 i-field + !
     endif      endif
     base offset ;      base offset ;
       
   : >tag ( index -- tag )
       dup dodoes-tag 2 + > IF
           $21 1 DO  dup tag-offsets I cells + @ < IF
                   tag-offsets I 1- cells + @ - I 1- 9 lshift + negate
                   UNLOOP  EXIT  THEN  LOOP
       THEN  -2 swap - ;
   
 : 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 78  s" address-unit-bits" environment? drop Line 84  s" address-unit-bits" environment? drop
                     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 $4000 or - 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
Line 91  s" address-unit-bits" environment? drop Line 97  s" address-unit-bits" environment? drop
                         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                      tag >tag file-id write-cell throw
                     i reloc-bits set-bit                      i reloc-bits set-bit
                 else                  else
                     cell1 file-id write-cell throw                      cell1 file-id write-cell throw
Line 106  s" address-unit-bits" environment? drop Line 112  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" Gforth2" 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"
     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.9  
changed lines
  Added in v.1.19


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