many changes, mostly for efficiency
This commit is contained in:
@@ -16,73 +16,64 @@ do_local_relocation()
|
||||
|
||||
/* Check if this reference is solvable. External references contain
|
||||
* -1 in 'on_valu'.
|
||||
* Also remove useless relocation structures.
|
||||
*/
|
||||
{
|
||||
register struct outrelo *ptr;
|
||||
register int s;
|
||||
register struct outrelo *rp;
|
||||
int diff = 0;
|
||||
|
||||
for ( ptr = reloc_info; ptr < relo; ptr++) {
|
||||
s = ptr->or_nami;
|
||||
if ( symbol_table[ s].on_valu != -1)
|
||||
do_relo(&symbol_table[ s], ptr);
|
||||
for ( rp = reloc_info; rp < relo; rp++) {
|
||||
register struct outname *np = &symbol_table[rp->or_nami];
|
||||
int olddiff = diff;
|
||||
|
||||
if ( np->on_valu != -1 && ! (np->on_type & S_COM)) {
|
||||
register long oldval,newval;
|
||||
register char *sect;
|
||||
|
||||
switch( rp->or_sect - S_MIN) {
|
||||
case SEGTXT:
|
||||
sect = text_area;
|
||||
if ((rp->or_type & RELPC) &&
|
||||
(np->on_type & S_TYP) - S_MIN == SEGTXT) {
|
||||
diff++;
|
||||
}
|
||||
break;
|
||||
case SEGCON:
|
||||
sect = data_area;
|
||||
break;
|
||||
default:
|
||||
fprint( STDERR,
|
||||
"do_local_relo(): bad section %d\n",
|
||||
rp->or_sect - S_MIN);
|
||||
break;
|
||||
}
|
||||
|
||||
if ( rp->or_type & RELO4) {
|
||||
oldval = get4( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put4( sect, rp->or_addr, newval);
|
||||
}
|
||||
else if ( rp->or_type & RELO2) {
|
||||
oldval = (long) get2( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put2( sect, rp->or_addr, (int) newval);
|
||||
}
|
||||
else if ( rp->or_type & RELO1) {
|
||||
oldval = (long) get1( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put1( sect, rp->or_addr, (char) newval);
|
||||
}
|
||||
else
|
||||
print( STDERR, "do_relo() : bad relocation size\n");
|
||||
rp->or_nami = seg_index((np->on_type & S_TYP) - S_MIN);
|
||||
/* print(
|
||||
"reloc %s adrr=%ld sect=%ld oldval=%ld newval=%ld def = %ld\n",
|
||||
np->on_foff+string_area, rp->or_addr, rp->or_sect-S_MIN, oldval, newval, np->on_valu);
|
||||
*/
|
||||
}
|
||||
if (diff && diff == olddiff) {
|
||||
rp[-diff] = rp[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
do_relo(np,rp)
|
||||
struct outname *np;
|
||||
struct outrelo *rp;
|
||||
|
||||
/* Solve the reference relative to the start of the segment where the symbol
|
||||
* is defined.
|
||||
*/
|
||||
{
|
||||
long oldval,newval;
|
||||
char *sect;
|
||||
|
||||
switch( rp->or_sect - S_MIN) {
|
||||
case SEGTXT:
|
||||
sect = text_area;
|
||||
break;
|
||||
case SEGCON:
|
||||
sect = data_area;
|
||||
break;
|
||||
default:
|
||||
fprint( STDERR,
|
||||
"do_local_relo(): bad section %d\n",
|
||||
rp->or_sect - S_MIN);
|
||||
break;
|
||||
}
|
||||
|
||||
if ( rp->or_type & RELO4) {
|
||||
oldval = get4( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put4( sect, rp->or_addr, newval);
|
||||
|
||||
rp->or_nami = seg_index(
|
||||
( symbol_table[ rp->or_nami].on_type & S_TYP) - S_MIN);
|
||||
}
|
||||
else if ( rp->or_type & RELO2) {
|
||||
oldval = (long) get2( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put2( sect, rp->or_addr, (int) newval);
|
||||
|
||||
rp->or_nami = seg_index(
|
||||
( symbol_table[ rp->or_nami].on_type & S_TYP) - S_MIN);
|
||||
}
|
||||
else if ( rp->or_type & RELO1) {
|
||||
oldval = (long) get1( sect, rp->or_addr);
|
||||
newval = oldval + np->on_valu;
|
||||
put1( sect, rp->or_addr, (char) newval);
|
||||
|
||||
rp->or_nami = seg_index(
|
||||
( symbol_table[ rp->or_nami].on_type & S_TYP) - S_MIN);
|
||||
}
|
||||
else
|
||||
print( STDERR, "do_relo() : bad relocation size\n");
|
||||
/* print(
|
||||
"reloc %s adrr=%ld sect=%ld oldval=%ld newval=%ld def = %ld\n",
|
||||
np->on_foff+string_area, rp->or_addr, rp->or_sect-S_MIN, oldval, newval, np->on_valu);
|
||||
*/
|
||||
|
||||
relo -= diff;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user