\r
#define DEBUG_WARN 1\r
\r
-\r
// === PROTOTYPES ===\r
tBinary *Elf_Load(int fp);\r
int Elf_Relocate(void *Base);\r
int iPageCount;\r
int count;\r
\r
- ENTER("ifp", fp);\r
+ ENTER("xfp", fp);\r
\r
// Read ELF Header\r
VFS_Read(fp, sizeof(hdr), &hdr);\r
LOG("phtab[%i] = {VAddr:0x%x,Offset:0x%x,FileSize:0x%x}",\r
i, phtab[i].VAddr, phtab[i].Offset, phtab[i].FileSize);\r
\r
- if( (phtab[i].FileSize & 0xFFF) < 0x1000 - (phtab[i].VAddr & 0xFFF) )\r
- lastSize = phtab[i].FileSize;\r
- else\r
+ //if( (phtab[i].FileSize & 0xFFF) < 0x1000 - (phtab[i].VAddr & 0xFFF) )\r
+ // lastSize = phtab[i].FileSize;\r
+ //else\r
lastSize = (phtab[i].FileSize & 0xFFF) + (phtab[i].VAddr & 0xFFF);\r
- lastSize &= 0xFFF;\r
+ //lastSize &= 0xFFF;\r
\r
- LOG("lastSize = 0x%x", lastSize);\r
+ //LOG("lastSize = 0x%x", lastSize);\r
+ \r
+ lastSize = phtab[i].FileSize;\r
\r
// Get Pages\r
count = ( (phtab[i].VAddr&0xFFF) + phtab[i].FileSize + 0xFFF) >> 12;\r
ret->Pages[j+k].Size = 4096;\r
LOG("ret->Pages[%i].Size = 0x%x", j+k, ret->Pages[j+k].Size);\r
ret->Pages[j+k].Flags = 0;\r
+ lastSize -= ret->Pages[j+k].Size;\r
}\r
count = (phtab[i].MemSize + 0xFFF) >> 12;\r
for(;k<count;k++)\r
// Parse Program Header to get Dynamic Table\r
phtab = Base + hdr->phoff;\r
iSegmentCount = hdr->phentcount;\r
- for(i=0;i<iSegmentCount;i++)\r
+ for(i = 0; i < iSegmentCount; i ++ )\r
{\r
// Determine linked base address\r
if(phtab[i].Type == PT_LOAD && iRealBase > phtab[i].VAddr)\r
// Find Dynamic Section\r
if(phtab[i].Type == PT_DYNAMIC) {\r
if(dynamicTab) {\r
- Warning("ELF", "Elf_Relocate - Multiple PT_DYNAMIC segments\n");\r
+ Log_Warning("ELF", "Elf_Relocate - Multiple PT_DYNAMIC segments\n");\r
continue;\r
}\r
- dynamicTab = (void *) phtab[i].VAddr;\r
+ dynamicTab = (void *) (tVAddr) phtab[i].VAddr;\r
j = i; // Save Dynamic Table ID\r
break;\r
}\r
\r
// Check if a PT_DYNAMIC segement was found\r
if(!dynamicTab) {\r
- Warning("ELF", "Elf_Relocate: No PT_DYNAMIC segment in image, returning\n");\r
+ Log_Warning("ELF", "Elf_Relocate: No PT_DYNAMIC segment in image, returning\n");\r
LEAVE('x', hdr->entrypoint);\r
return hdr->entrypoint;\r
}\r
// --- Symbol Table ---\r
case DT_SYMTAB:\r
dynamicTab[j].d_val += iBaseDiff;\r
- dynsymtab = (void*)(dynamicTab[j].d_val);\r
+ dynsymtab = (void*) (tVAddr) dynamicTab[j].d_val;\r
hdr->misc.SymTable = dynamicTab[j].d_val; // Saved in unused bytes of ident\r
break;\r
\r
// --- String Table ---\r
case DT_STRTAB:\r
dynamicTab[j].d_val += iBaseDiff;\r
- dynstrtab = (void*)(dynamicTab[j].d_val);\r
+ dynstrtab = (void*) (tVAddr) dynamicTab[j].d_val;\r
break;\r
\r
// --- Hash Table --\r
case DT_HASH:\r
dynamicTab[j].d_val += iBaseDiff;\r
- iSymCount = ((Uint*)(dynamicTab[j].d_val))[1];\r
+ iSymCount = ((Uint*)((tVAddr)dynamicTab[j].d_val))[1];\r
hdr->misc.HashTable = dynamicTab[j].d_val; // Saved in unused bytes of ident\r
break;\r
}\r
\r
\r
// Alter Symbols to true base\r
- for(i=0;i<iSymCount;i++)\r
+ for(i = 0; i < iSymCount; i ++)\r
{\r
dynsymtab[i].value += iBaseDiff;\r
dynsymtab[i].nameOfs += (Uint)dynstrtab;\r
// --- Needed Library ---\r
case DT_NEEDED:\r
libPath = dynstrtab + dynamicTab[j].d_val;\r
- LOG("Required Library '%s' (IGNORED in kernel mode)\n", libPath);\r
+ Log_Notice("ELF", "%p - Required Library '%s' (Ignored in kernel mode)\n", Base, libPath);\r
break;\r
// --- PLT/GOT ---\r
- case DT_PLTGOT: pltgot = (void*)iBaseDiff+(dynamicTab[j].d_val); break;\r
+ case DT_PLTGOT: pltgot = (void*)(iBaseDiff+dynamicTab[j].d_val); break;\r
case DT_JMPREL: plt = (void*)(iBaseDiff+dynamicTab[j].d_val); break;\r
case DT_PLTREL: pltType = dynamicTab[j].d_val; break;\r
case DT_PLTRELSZ: pltSz = dynamicTab[j].d_val; break;\r
case DT_REL: rel = (void*)(iBaseDiff + dynamicTab[j].d_val); break;\r
case DT_RELSZ: relSz = dynamicTab[j].d_val; break;\r
case DT_RELENT: relEntSz = dynamicTab[j].d_val; break;\r
+ \r
case DT_RELA: rela = (void*)(iBaseDiff + dynamicTab[j].d_val); break;\r
case DT_RELASZ: relaSz = dynamicTab[j].d_val; break;\r
case DT_RELAENT: relaEntSz = dynamicTab[j].d_val; break;\r
{\r
Elf32_Rel *pltRel = plt;\r
j = pltSz / sizeof(Elf32_Rel);\r
+ LOG("PLT Rel - plt = %p, pltSz = %i (%i ents)", plt, pltSz, j);\r
for(i = 0; i < j; i++)\r
{\r
ptr = (void*)(iBaseDiff + pltRel[i].r_offset);\r
{\r
Elf32_Rela *pltRela = plt;\r
j = pltSz / sizeof(Elf32_Rela);\r
+ LOG("PLT RelA - plt = %p, pltSz = %i (%i ents)", plt, pltSz, j);\r
for(i=0;i<j;i++)\r
{\r
- ptr = (void*)((Uint)Base + pltRela[i].r_offset);\r
+ ptr = (void*)(iBaseDiff + pltRela[i].r_offset);\r
if( !Elf_Int_DoRelocate(pltRela[i].r_info, ptr, pltRela[i].r_addend, dynsymtab, (Uint)Base) ) {\r
bFailed = 1;\r
}\r
if( !Elf_GetSymbol((void*)base, sSymName, &val) ) // Search this binary first\r
if( !Binary_GetSymbol( sSymName, &val ) )\r
return 0;\r
- LOG("R_386_32 *0x%x += 0x%x('%s')", ptr, val, sSymName);\r
+ LOG("%08x R_386_32 *0x%x += 0x%x('%s')", r_info, ptr, val, sSymName);\r
*ptr = val + addend;\r
break;\r
\r
if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )\r
if( !Binary_GetSymbol( sSymName, &val ) )\r
return 0;\r
- LOG("R_386_PC32 *0x%x = 0x%x + 0x%x('%s') - 0x%x", ptr, *ptr, val, sSymName, (Uint)ptr );\r
+ LOG("%08x R_386_PC32 *0x%x = 0x%x + 0x%x('%s') - 0x%x", r_info, ptr, *ptr, val, sSymName, (Uint)ptr );\r
// TODO: Check if it needs the true value of ptr or the compiled value\r
// NOTE: Testing using true value\r
*ptr = val + addend - (Uint)ptr;\r
if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )\r
if( !Binary_GetSymbol( sSymName, &val ) )\r
return 0;\r
- LOG("R_386_GLOB_DAT *0x%x = 0x%x (%s)", ptr, val, sSymName);\r
+ LOG("%08x R_386_GLOB_DAT *0x%x = 0x%x (%s)", r_info, ptr, val, sSymName);\r
*ptr = val;\r
break;\r
\r
if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )\r
if( !Binary_GetSymbol( sSymName, &val ) )\r
return 0;\r
- LOG("R_386_JMP_SLOT *0x%x = 0x%x (%s)", ptr, val, sSymName);\r
+ LOG("%08x R_386_JMP_SLOT *0x%x = 0x%x (%s)", r_info, ptr, val, sSymName);\r
*ptr = val;\r
break;\r
\r
// Base Address (B+A)\r
case R_386_RELATIVE:\r
- LOG("R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, base, addend);\r
+ LOG("%08x R_386_RELATIVE *0x%x = 0x%x + 0x%x", r_info, ptr, base, addend);\r
*ptr = base + addend;\r
break;\r
\r