Commit d64a2bdd authored by Russ Cox's avatar Russ Cox

tabs

TBR=lvd
CC=golang-dev
https://golang.org/cl/2194041
parent b7e9e918
...@@ -301,9 +301,9 @@ doelf(void) ...@@ -301,9 +301,9 @@ doelf(void)
elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts"); elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts");
elfstr[ElfStrGosymtab] = addstring(shstrtab, ".gosymtab"); elfstr[ElfStrGosymtab] = addstring(shstrtab, ".gosymtab");
elfstr[ElfStrGopclntab] = addstring(shstrtab, ".gopclntab"); elfstr[ElfStrGopclntab] = addstring(shstrtab, ".gopclntab");
elfstr[ElfStrSymtab] = addstring(shstrtab, ".symtab"); elfstr[ElfStrSymtab] = addstring(shstrtab, ".symtab");
elfstr[ElfStrStrtab] = addstring(shstrtab, ".strtab"); elfstr[ElfStrStrtab] = addstring(shstrtab, ".strtab");
dwarfaddshstrings(shstrtab); dwarfaddshstrings(shstrtab);
} }
elfstr[ElfStrShstrtab] = addstring(shstrtab, ".shstrtab"); elfstr[ElfStrShstrtab] = addstring(shstrtab, ".shstrtab");
...@@ -644,10 +644,10 @@ asmb(void) ...@@ -644,10 +644,10 @@ asmb(void)
elfsymsize = elfstro - elfsymo; elfsymsize = elfstro - elfsymo;
write(cout, elfstrdat, elfstrsize); write(cout, elfstrdat, elfstrsize);
if(debug['v']) if(debug['v'])
Bprint(&bso, "%5.2f dwarf\n", cputime()); Bprint(&bso, "%5.2f dwarf\n", cputime());
dwarfemitdebugsections(); dwarfemitdebugsections();
} }
} else if(dlm){ } else if(dlm){
seek(cout, HEADR+textsize+datsize, 0); seek(cout, HEADR+textsize+datsize, 0);
...@@ -923,21 +923,21 @@ asmb(void) ...@@ -923,21 +923,21 @@ asmb(void)
sh->addralign = 1; sh->addralign = 1;
sh->addr = symdatva + 8 + symsize; sh->addr = symdatva + 8 + symsize;
sh = newElfShdr(elfstr[ElfStrSymtab]); sh = newElfShdr(elfstr[ElfStrSymtab]);
sh->type = SHT_SYMTAB; sh->type = SHT_SYMTAB;
sh->off = elfsymo; sh->off = elfsymo;
sh->size = elfsymsize; sh->size = elfsymsize;
sh->addralign = 8; sh->addralign = 8;
sh->entsize = 24; sh->entsize = 24;
sh->link = eh->shnum; // link to strtab sh->link = eh->shnum; // link to strtab
sh = newElfShdr(elfstr[ElfStrStrtab]); sh = newElfShdr(elfstr[ElfStrStrtab]);
sh->type = SHT_STRTAB; sh->type = SHT_STRTAB;
sh->off = elfstro; sh->off = elfstro;
sh->size = elfstrsize; sh->size = elfstrsize;
sh->addralign = 1; sh->addralign = 1;
dwarfaddelfheaders(); dwarfaddelfheaders();
} }
sh = newElfShstrtab(elfstr[ElfStrShstrtab]); sh = newElfShstrtab(elfstr[ElfStrShstrtab]);
...@@ -993,7 +993,7 @@ cflush(void) ...@@ -993,7 +993,7 @@ cflush(void)
vlong vlong
cpos(void) cpos(void)
{ {
return seek(cout, 0, 1) + sizeof(buf.cbuf) - cbc; return seek(cout, 0, 1) + sizeof(buf.cbuf) - cbc;
} }
void void
......
...@@ -576,7 +576,7 @@ loop: ...@@ -576,7 +576,7 @@ loop:
histfrogp++; histfrogp++;
} else } else
collapsefrog(s); collapsefrog(s);
dwarfaddfrag(s->value, s->name); dwarfaddfrag(s->value, s->name);
} }
goto loop; goto loop;
} }
......
...@@ -294,7 +294,7 @@ doelf(void) ...@@ -294,7 +294,7 @@ doelf(void)
elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts"); elfstr[ElfStrGosymcounts] = addstring(shstrtab, ".gosymcounts");
elfstr[ElfStrGosymtab] = addstring(shstrtab, ".gosymtab"); elfstr[ElfStrGosymtab] = addstring(shstrtab, ".gosymtab");
elfstr[ElfStrGopclntab] = addstring(shstrtab, ".gopclntab"); elfstr[ElfStrGopclntab] = addstring(shstrtab, ".gopclntab");
dwarfaddshstrings(shstrtab); dwarfaddshstrings(shstrtab);
} }
elfstr[ElfStrShstrtab] = addstring(shstrtab, ".shstrtab"); elfstr[ElfStrShstrtab] = addstring(shstrtab, ".shstrtab");
...@@ -660,11 +660,11 @@ asmb(void) ...@@ -660,11 +660,11 @@ asmb(void)
lputl(symsize); lputl(symsize);
lputl(lcsize); lputl(lcsize);
cflush(); cflush();
if(HEADTYPE != 10 && !debug['s']) { if(HEADTYPE != 10 && !debug['s']) {
seek(cout, symo+8+symsize+lcsize, 0); seek(cout, symo+8+symsize+lcsize, 0);
if(debug['v']) if(debug['v'])
Bprint(&bso, "%5.2f dwarf\n", cputime()); Bprint(&bso, "%5.2f dwarf\n", cputime());
dwarfemitdebugsections(); dwarfemitdebugsections();
} }
} else if(dlm){ } else if(dlm){
seek(cout, HEADR+textsize+datsize, 0); seek(cout, HEADR+textsize+datsize, 0);
...@@ -1059,7 +1059,7 @@ asmb(void) ...@@ -1059,7 +1059,7 @@ asmb(void)
sh->addralign = 1; sh->addralign = 1;
sh->addr = symdatva + 8 + symsize; sh->addr = symdatva + 8 + symsize;
dwarfaddelfheaders(); dwarfaddelfheaders();
} }
sh = newElfShstrtab(elfstr[ElfStrShstrtab]); sh = newElfShstrtab(elfstr[ElfStrShstrtab]);
...@@ -1140,7 +1140,7 @@ cflush(void) ...@@ -1140,7 +1140,7 @@ cflush(void)
vlong vlong
cpos(void) cpos(void)
{ {
return seek(cout, 0, 1) + sizeof(buf.cbuf) - cbc; return seek(cout, 0, 1) + sizeof(buf.cbuf) - cbc;
} }
void void
......
...@@ -605,7 +605,7 @@ loop: ...@@ -605,7 +605,7 @@ loop:
histfrogp++; histfrogp++;
} else } else
collapsefrog(s); collapsefrog(s);
dwarfaddfrag(s->value, s->name); dwarfaddfrag(s->value, s->name);
} }
goto loop; goto loop;
} }
......
...@@ -867,11 +867,11 @@ dwarfaddmachoheaders(void) ...@@ -867,11 +867,11 @@ dwarfaddmachoheaders(void)
vlong fakestart; vlong fakestart;
// Zero vsize segments won't be loaded in memory, even so they // Zero vsize segments won't be loaded in memory, even so they
// have to be page aligned in the file. // have to be page aligned in the file.
fakestart = abbrevo & ~0xfff; fakestart = abbrevo & ~0xfff;
ms = newMachoSeg("__DWARF", 3); ms = newMachoSeg("__DWARF", 3);
ms->fileoffset = fakestart; ms->fileoffset = fakestart;
ms->filesize = abbrevo-fakestart + abbrevsize+linesize+infosize; ms->filesize = abbrevo-fakestart + abbrevsize+linesize+infosize;
......
...@@ -324,8 +324,8 @@ loop: ...@@ -324,8 +324,8 @@ loop:
if (*p == ' ' && !inquote) if (*p == ' ' && !inquote)
break; break;
if(*p == '\\') if(*p == '\\')
p++; p++;
else if(*p == '"') else if(*p == '"')
inquote = !inquote; inquote = !inquote;
......
...@@ -619,7 +619,7 @@ asmbmacho(vlong symdatva, vlong symo) ...@@ -619,7 +619,7 @@ asmbmacho(vlong symdatva, vlong symo)
md->fileoffset = symo+8+symsize; md->fileoffset = symo+8+symsize;
md->filesize = lcsize; md->filesize = lcsize;
dwarfaddmachoheaders(); dwarfaddmachoheaders();
} }
a = machowrite(); a = machowrite();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment