[BACK]Return to comp-i.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

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

version 1.9, 2002/01/14 08:40:23 version 1.12, 2003/03/09 15:16:46
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 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 48  s" address-unit-bits" environment? drop Line 48  s" address-unit-bits" environment? drop
         0 image1 i-field + ! 0 image2 i-field + !          0 image1 i-field + ! 0 image2 i-field + !
     endif      endif
     base offset ;      base offset ;
       
   Create tag-offsets
   include kernel/groups.fs
   tag-offsets $20 cells + here tuck - dup allot erase
   
   : >tag ( index -- tag )
       dup dodoes-tag 2 + > IF  dodoes-tag 2 + -
           $21 1 DO  dup tag-offsets I cells + @ < IF
                   tag-offsets I 1- cells + @ - I 9 lshift + negate
                   UNLOOP  EXIT  THEN  LOOP
           dodoes-tag 2 + +
       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 89  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 102  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 117  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.12

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