Diff for /gforth/comp-i.fs between versions 1.8 and 1.17

version 1.8, 2001/02/24 17:24:44 version 1.17, 2007/09/29 22:20:02
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 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 19 Line 19
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  \ 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 37  s" address-unit-bits" environment? drop Line 37  s" address-unit-bits" environment? drop
     >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
           \ the following sanity check produces false positices with exec-shield
           \ offset abs expected-offset <> abort" images produced by different engines"
           ."  offset=" offset . cr
           0 image1 i-field + ! 0 image2 i-field + !
       endif
       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.
     \G offset is the difference for relocated addresses      \G offset is the difference for relocated addresses
Line 45  s" address-unit-bits" environment? drop Line 65  s" address-unit-bits" environment? drop
     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 }
Line 68  s" address-unit-bits" environment? drop Line 81  s" address-unit-bits" environment? drop
                 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 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 $4000 xor file-id write-cell throw
                 i reloc-bits set-bit                  i reloc-bits set-bit
             else              else
                 cell1 file-id write-cell throw                  xoffset 0<> cell1 xoffset + cell2 = and
                 cell1 cell2 <>  
                 if                  if
                     0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr                      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
                       cell1 file-id write-cell throw
                       cell1 cell2 <>
                       if
                           0 i th 9 u.r cell1 17 u.r cell2 17 u.r cr
                       endif
                 endif                  endif
             endif              endif
         endif          endif
Line 85  s" address-unit-bits" environment? drop Line 113  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.8  
changed lines
  Added in v.1.17


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