d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean tccelf.c

Browse source 
- remove debug printf and commented out code
- remove C++-like comments
- remove whitespace at end of lines
- replace tabs by spaces
This commit is contained in:
Thomas Preud'homme 2013-12-17 20:59:14 +08:00
parent 6f3569e4e2
commit 3d4b57ffe3
1 changed files with 179 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
tccelf.c
View file

@ -785,13 +785,13 @@ ST_FUNC void relocate_section(TCCState *s1, Section *s)
{ {
uint32_t orig; uint32_t orig;
/* put the low 16 bits of the absolute address */ /* put the low 16 bits of the absolute address
// add to what is already there add to what is already there */
orig = ((*(int *)(ptr )) >> 7) & 0xffff; orig = ((*(int *)(ptr )) >> 7) & 0xffff;
orig |= (((*(int *)(ptr+4)) >> 7) & 0xffff) << 16; orig |= (((*(int *)(ptr+4)) >> 7) & 0xffff) << 16;
//patch both at once - assumes always in pairs Low - High /* patch both at once - assumes always in pairs Low - High */
*(int *) ptr = (*(int *) ptr & (~(0xffff << 7)) ) | (((val+orig) & 0xffff) << 7); *(int *) ptr = (*(int *) ptr & (~(0xffff << 7)) ) | (((val+orig) & 0xffff) << 7);
*(int *)(ptr+4) = (*(int *)(ptr+4) & (~(0xffff << 7)) ) | ((((val+orig)>>16) & 0xffff) << 7); *(int *)(ptr+4) = (*(int *)(ptr+4) & (~(0xffff << 7)) ) | ((((val+orig)>>16) & 0xffff) << 7);
@ -1110,14 +1110,14 @@ static void put_got_entry(TCCState *s1,
if (s1->sym_attrs[sym_index].plt_thumb_stub) { if (s1->sym_attrs[sym_index].plt_thumb_stub) {
p = section_ptr_add(plt, 20); p = section_ptr_add(plt, 20);
put32(p , 0x4778); // bx pc put32(p , 0x4778); /* bx pc */
put32(p+2, 0x46c0); // nop put32(p+2, 0x46c0); /* nop */
p += 4; p += 4;
} else } else
p = section_ptr_add(plt, 16); p = section_ptr_add(plt, 16);
put32(p , 0xe59fc004); // ldr ip, [pc, #4] // offset in GOT put32(p , 0xe59fc004); /* ldr ip, [pc, #4] ; offset in GOT */
put32(p+4, 0xe08fc00c); // add ip, pc, ip // absolute address or offset put32(p+4, 0xe08fc00c); /* add ip, pc, ip ; absolute address or offset */
put32(p+8, 0xe59cf000); // ldr pc, [ip] // load absolute address or load offset put32(p+8, 0xe59cf000); /* ldr pc, [ip] ; load absolute address or load offset */
put32(p+12, s1->got->data_offset); put32(p+12, s1->got->data_offset);
/* the symbol is modified so that it will be relocated to /* the symbol is modified so that it will be relocated to
@ -1468,12 +1468,12 @@ void patch_dynsym_undef(TCCState *s1, Section *s)
uint32_t *gotd = (void *)s1->got->data; uint32_t *gotd = (void *)s1->got->data;
ElfW(Sym) *sym, *sym_end; ElfW(Sym) *sym, *sym_end;
gotd += 3; // dummy entries in .got gotd += 3; /* dummy entries in .got */
/* relocate symbols in .dynsym */ /* relocate symbols in .dynsym */
sym_end = (ElfW(Sym) *)(s->data + s->data_offset); sym_end = (ElfW(Sym) *)(s->data + s->data_offset);
for (sym = (ElfW(Sym) *)s->data + 1; sym < sym_end; sym++) { for (sym = (ElfW(Sym) *)s->data + 1; sym < sym_end; sym++) {
if (sym->st_shndx == SHN_UNDEF) { if (sym->st_shndx == SHN_UNDEF) {
*gotd++ = sym->st_value + 6; // XXX 6 is magic ? *gotd++ = sym->st_value + 6; /* XXX 6 is magic ? */
sym->st_value = 0; sym->st_value = 0;
} }
} }
@ -1655,7 +1655,7 @@ static int elf_output_file(TCCState *s1, const char *filename)
index = put_elf_sym(s1->dynsym, offset, esym->st_size, index = put_elf_sym(s1->dynsym, offset, esym->st_size,
esym->st_info, 0, esym->st_info, 0,
bss_section->sh_num, name); bss_section->sh_num, name);
// Ensure R_COPY works for weak symbol aliases /* Ensure R_COPY works for weak symbol aliases */
if (ELFW(ST_BIND)(esym->st_info) == STB_WEAK) { if (ELFW(ST_BIND)(esym->st_info) == STB_WEAK) {
dynsym_end = (ElfW(Sym) *) dynsym_end = (ElfW(Sym) *)
(s1->dynsymtab_section->data + (s1->dynsymtab_section->data +
@ -1839,21 +1839,12 @@ static int elf_output_file(TCCState *s1, const char *filename)
for(i = 1; i < s1->nb_sections; i++) { for(i = 1; i < s1->nb_sections; i++) {
s = s1->sections[i]; s = s1->sections[i];
s->sh_name = put_elf_str(strsec, s->name); s->sh_name = put_elf_str(strsec, s->name);
#if 0 /* gr */
printf("section: f=%08x t=%08x i=%08x %s %s\n",
s->sh_flags,
s->sh_type,
s->sh_info,
s->name,
s->reloc ? s->reloc->name : "n"
);
#endif
/* when generating a DLL, we include relocations but we may /* when generating a DLL, we include relocations but we may
patch them */ patch them */
if (file_type == TCC_OUTPUT_DLL && if (file_type == TCC_OUTPUT_DLL &&
s->sh_type == SHT_RELX && s->sh_type == SHT_RELX &&
!(s->sh_flags & SHF_ALLOC)) { !(s->sh_flags & SHF_ALLOC)) {
/* //gr: avoid bogus relocs for empty (debug) sections */ /* gr: avoid bogus relocs for empty (debug) sections */
if (s1->sections[s->sh_info]->sh_flags & SHF_ALLOC) if (s1->sections[s->sh_info]->sh_flags & SHF_ALLOC)
prepare_dynamic_rel(s1, s); prepare_dynamic_rel(s1, s);
else if (s1->do_debug) else if (s1->do_debug)
@ -1969,13 +1960,13 @@ static int elf_output_file(TCCState *s1, const char *filename)
/* update dynamic relocation infos */ /* update dynamic relocation infos */
if (s->sh_type == SHT_RELX) { if (s->sh_type == SHT_RELX) {
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (!strcmp(strsec->data + s->sh_name, ".rel.got")) { // rel_size == 0) { if (!strcmp(strsec->data + s->sh_name, ".rel.got")) {
rel_addr = addr; rel_addr = addr;
rel_size += s->sh_size; // XXX only first rel. rel_size += s->sh_size; /* XXX only first rel. */
} }
if (!strcmp(strsec->data + s->sh_name, ".rel.bss")) { // rel_size == 0) { if (!strcmp(strsec->data + s->sh_name, ".rel.bss")) {
bss_addr = addr; bss_addr = addr;
bss_size = s->sh_size; // XXX only first rel. bss_size = s->sh_size; /* XXX only first rel. */
} }
#else #else
if (rel_size == 0) if (rel_size == 0)
@ -2019,7 +2010,7 @@ static int elf_output_file(TCCState *s1, const char *filename)
ph->p_paddr = ph->p_vaddr; ph->p_paddr = ph->p_vaddr;
ph->p_filesz = ph->p_memsz = len; ph->p_filesz = ph->p_memsz = len;
ph->p_flags = PF_R | PF_X; ph->p_flags = PF_R | PF_X;
ph->p_align = 4; // interp->sh_addralign; ph->p_align = 4; /* interp->sh_addralign; */
ph++; ph++;
} }
#endif #endif
@ -2518,7 +2509,7 @@ ST_FUNC int tcc_load_object_file(TCCState *s1,
next: ; next: ;
} }
/* //gr relocate stab strings */ /* gr relocate stab strings */
if (stab_index && stabstr_index) { if (stab_index && stabstr_index) {
Stab_Sym *a, *b; Stab_Sym *a, *b;
unsigned o; unsigned o;
@ -2690,9 +2681,6 @@ static int tcc_load_alacarte(TCCState *s1, int fd, int size)
sym = &((ElfW(Sym) *)symtab_section->data)[sym_index]; sym = &((ElfW(Sym) *)symtab_section->data)[sym_index];
if(sym->st_shndx == SHN_UNDEF) { if(sym->st_shndx == SHN_UNDEF) {
off = get_be32(ar_index + i * 4) + sizeof(ArchiveHeader); off = get_be32(ar_index + i * 4) + sizeof(ArchiveHeader);
#if 0
printf("%5d\t%s\t%08x\n", i, p, sym->st_shndx);
#endif
++bound; ++bound;
lseek(fd, off, SEEK_SET); lseek(fd, off, SEEK_SET);
if(tcc_load_object_file(s1, fd, off) < 0) { if(tcc_load_object_file(s1, fd, off) < 0) {
@ -2740,7 +2728,6 @@ ST_FUNC int tcc_load_archive(TCCState *s1, int fd)
break; break;
} }
ar_name[i + 1] = '\0'; ar_name[i + 1] = '\0';
// printf("name='%s' size=%d %s\n", ar_name, size, ar_size);
file_offset = lseek(fd, 0, SEEK_CUR); file_offset = lseek(fd, 0, SEEK_CUR);
/* align to even */ /* align to even */
size = (size + 1) & ~1; size = (size + 1) & ~1;
@ -2833,8 +2820,6 @@ ST_FUNC int tcc_load_dll(TCCState *s1, int fd, const char *filename, int level)
} }
} }
// printf("loading dll '%s'\n", soname);
/* add the dll and its level */ /* add the dll and its level */
dllref = tcc_mallocz(sizeof(DLLReference) + strlen(soname)); dllref = tcc_mallocz(sizeof(DLLReference) + strlen(soname));
dllref->level = level; dllref->level = level;
@ -2993,11 +2978,6 @@ static int ld_next(TCCState *s1, char *name, int name_size)
inp(); inp();
break; break;
} }
#if 0
printf("tok=%c %d\n", c, c);
if (c == LD_TOK_NAME)
printf(" name=%s\n", name);
#endif
return c; return c;
} }
@ -3136,4 +3116,4 @@ ST_FUNC int tcc_load_ldscript(TCCState *s1)
} }
return 0; return 0;
} }
#endif /* ndef TCC_TARGET_PE */ #endif /* !TCC_TARGET_PE */