Changeset 3544


Ignore:
Timestamp:
Feb 13, 2013, 8:36:31 AM (23 months ago)
Author:
quozl
Message:

mkdropin - again fix calculation of ending address for reserved area skip, by adding the pad to 4-byte boundary. A build using builder.dic from before svn 3540 had the reserved header exactly at reserved-start. See also svn 1980. Regenerated ARM builder using koji2.laptop.org.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • forth/lib/mkdropin.fth

    r3540 r3544  
    131131; 
    132132: write-dropin  ( adr len expanded-len name-str -- ) 
    133    2>r >r                                   ( adr len  r: name$ expanded-len ) 
    134  
    135    \ Calculate expected ending position 
    136    dup  ofd @ ftell h# 20 + +                   ( adr len pos ) 
     133   2>r >r                                     ( adr len  r: name$ expanded-len ) 
     134 
     135   \ Calculate expected ending file position 
     136   ofd @ ftell  over  4 round-up +  h# 20 +   ( adr len pos ) 
    137137 
    138138   \ Encroaches upon manufacturing data area?  If so, enumerate as a dropin. 
    139    reserved-start h# 20 - reserved-end  within  if 
     139   reserved-start reserved-end  within  if 
    140140      \ Calculate size of a dropin covering reserved area 
    141141      reserved-end ofd @ ftell -  h# 20 -     ( adr len reslen ) 
Note: See TracChangeset for help on using the changeset viewer.