github.com/open-simh.simtools
1
0
Fork 0
mirror of https://github.com/open-simh/simtools.git synced 2026-05-04 15:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Always block out a psect length to be even

Browse Source
This commit is contained in:
AK6DN
2017-04-09 17:55:34 -07:00
parent f58c4268f9
commit 688828abd0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
obj2bin.pl
View File

@@ -754,7 +754,7 @@ sub parse_rec ($$$) {
$def = $flg&(1<<3) ? "DEF" : "REF"; $def = $flg&(1<<3) ? "DEF" : "REF";
if ($def eq "DEF" && exists $gblsym{$sym}{$def} && $adr != $gblsym{$sym}{$def}{ADDRESS}) { if ($def eq "DEF" && exists $gblsym{$sym}{$def} && $adr != $gblsym{$sym}{$def}{ADDRESS}) {
# issue a warning for multiple definition with a different address # issue a warning for multiple definition with a different address
warn sprintf("Warning: attempted global symbol redefinition: symbol=%s (address/psect) old=%06o/%s new=%06o/%s -- IGNORING\n", warn sprintf("Warning: global symbol redefinition: symbol=%s (address/psect) old=%06o/%s new=%06o/%s -- IGNORING\n",
&trim($sym), $gblsym{$sym}{$def}{ADDRESS}, &trim($gblsym{$sym}{$def}{PSECT}), $adr, &trim($psectname)); &trim($sym), $gblsym{$sym}{$def}{ADDRESS}, &trim($gblsym{$sym}{$def}{PSECT}), $adr, &trim($psectname));
} else { } else {
# define first time only ... ignore any redefinition attempt # define first time only ... ignore any redefinition attempt
@@ -774,6 +774,7 @@ sub parse_rec ($$$) {
$psect{$nam}{FLG}{$flg&(1<<4) ? "R/O" : "R/W"}++; $psect{$nam}{FLG}{$flg&(1<<4) ? "R/O" : "R/W"}++;
$psect{$nam}{FLG}{$flg&(1<<5) ? "REL" : "ABS"}++; $psect{$nam}{FLG}{$flg&(1<<5) ? "REL" : "ABS"}++;
$psect{$nam}{FLG}{$flg&(1<<7) ? "D" : "I/D"}++; $psect{$nam}{FLG}{$flg&(1<<7) ? "D" : "I/D"}++;
$val++ if $val & 1;
if ($psect{$nam}{FLG}{CON}) { if ($psect{$nam}{FLG}{CON}) {
$psect{$nam}{LENGTH} = $val; $psect{$nam}{LENGTH} = $val;
$psect{$nam}{START} = $psectaddr; $psect{$nam}{START} = $psectaddr;