qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 08:10:21 -07:00
Code Releases Activity

cmd/ld: wrap long data lines in -a output

Browse Source 
Also move symbol names onto lines by themselves: some are very long.
Show relocations.

R=ken2
CC=golang-dev
https://golang.org/cl/7689043
This commit is contained in:
Russ Cox 2013-03-10 16:32:00 -04:00
parent df6072b41c
commit 4c40e5ae51
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/cmd/ld/data.c
View File

@ -553,8 +553,10 @@ void
datblk(int32 addr, int32 size) datblk(int32 addr, int32 size)
{ {
Sym *sym; Sym *sym;
int32 eaddr; int32 i, eaddr;
uchar *p, *ep; uchar *p, *ep;
char *typ, *rsname;
Reloc *r;
if(debug['a']) if(debug['a'])
Bprint(&bso, "datblk [%#x,%#x) at offset %#llx\n", addr, addr+size, cpos()); Bprint(&bso, "datblk [%#x,%#x) at offset %#llx\n", addr, addr+size, cpos());
@ -574,23 +576,46 @@ datblk(int32 addr, int32 size)
if(sym->value >= eaddr) if(sym->value >= eaddr)
break; break;
if(addr < sym->value) { if(addr < sym->value) {
Bprint(&bso, "%-20s %.8ux| 00 ...\n", "(pre-pad)", addr); Bprint(&bso, "\t%.8ux| 00 ...\n", addr);
addr = sym->value; addr = sym->value;
} }
Bprint(&bso, "%-20s %.8ux|", sym->name, (uint)addr); Bprint(&bso, "%s\n\t%.8ux|", sym->name, (uint)addr);
p = sym->p; p = sym->p;
ep = p + sym->np; ep = p + sym->np;
while(p < ep) while(p < ep) {
if(p > sym->p && (int)(p-sym->p)%16 == 0)
Bprint(&bso, "\n\t%.8ux|", (uint)(addr+(p-sym->p)));
Bprint(&bso, " %.2ux", *p++); Bprint(&bso, " %.2ux", *p++);
}
addr += sym->np; addr += sym->np;
for(; addr < sym->value+sym->size; addr++) for(; addr < sym->value+sym->size; addr++)
Bprint(&bso, " %.2ux", 0); Bprint(&bso, " %.2ux", 0);
Bprint(&bso, "\n"); Bprint(&bso, "\n");
if(isobj) {
for(i=0; i<sym->nr; i++) {
r = &sym->r[i];
rsname = "";
if(r->sym)
rsname = r->sym->name;
typ = "?";
switch(r->type) {
case D_ADDR:
typ = "addr";
break;
case D_PCREL:
typ = "pcrel";
break;
}
Bprint(&bso, "\treloc %.8ux/%d %s %s+%#llx [%#llx]\n",
(uint)(sym->value+r->off), r->siz, typ, rsname, r->add, r->sym->value+r->add);
}
}
} }
if(addr < eaddr) if(addr < eaddr)
Bprint(&bso, "%-20s %.8ux| 00 ...\n", "(post-pad)", (uint)addr); Bprint(&bso, "\t%.8ux| 00 ...\n", (uint)addr);
Bprint(&bso, "%-20s %.8ux|\n", "", (uint)eaddr); Bprint(&bso, "\t%.8ux|\n", (uint)eaddr);
} }
void void