X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbin%2Felf.c;h=4bf15fa2f9a2524ba23663c8d7d267008f7b1379;hb=b9615a08ff1f70d112b480673ebd5079468658a4;hp=2f37739e13e10d0e186057f55aa16d03bd60b3fd;hpb=1e7db40300bc594cf708bb6082a6e05a268da946;p=tpg%2Facess2.git

diff --git a/Kernel/bin/elf.c b/Kernel/bin/elf.c
index 2f37739e..4bf15fa2 100644
--- a/Kernel/bin/elf.c
+++ b/Kernel/bin/elf.c
@@ -2,8 +2,8 @@
  * Acess v0.1
  * ELF Executable Loader Code
  */
-#define DEBUG	0
-#include <common.h>
+#define DEBUG	1
+#include <acess.h>
 #include <binary.h>
 #include "elf.h"
 
@@ -35,7 +35,7 @@ tBinary *Elf_Load(int fp)
 	 int	iPageCount;
 	 int	count;
 	
-	ENTER("ifp", fp);
+	ENTER("xfp", fp);
 	
 	// Read ELF Header
 	VFS_Read(fp, sizeof(hdr), &hdr);
@@ -57,7 +57,12 @@ tBinary *Elf_Load(int fp)
 	}
 	
 	// Read Program Header Table
-	phtab = malloc(sizeof(Elf32_Phdr)*hdr.phentcount);
+	phtab = malloc( sizeof(Elf32_Phdr) * hdr.phentcount );
+	if( !phtab ) {
+		LEAVE('n');
+		return NULL;
+	}
+	LOG("hdr.phoff = 0x%08x", hdr.phoff);
 	VFS_Seek(fp, hdr.phoff, SEEK_SET);
 	VFS_Read(fp, sizeof(Elf32_Phdr)*hdr.phentcount, phtab);
 	
@@ -76,7 +81,7 @@ tBinary *Elf_Load(int fp)
 	LOG("iPageCount = %i", iPageCount);
 	
 	// Allocate Information Structure
-	ret = malloc( sizeof(tBinary) + 3*sizeof(Uint)*iPageCount );
+	ret = malloc( sizeof(tBinary) + sizeof(tBinaryPage)*iPageCount );
 	// Fill Info Struct
 	ret->Entry = hdr.entrypoint;
 	ret->Base = -1;		// Set Base to maximum value
@@ -88,7 +93,17 @@ tBinary *Elf_Load(int fp)
 	for( i = 0; i < hdr.phentcount; i++ )
 	{
 		 int	lastSize;
-		LOG("phtab[%i].Type = 0x%x", i, phtab[i].Type);
+		//LOG("phtab[%i].Type = 0x%x", i, phtab[i].Type);
+		LOG("phtab[%i] = {", i);
+		LOG(" .Type = 0x%08x", phtab[i].Type);
+		LOG(" .Offset = 0x%08x", phtab[i].Offset);
+		LOG(" .VAddr = 0x%08x", phtab[i].VAddr);
+		LOG(" .PAddr = 0x%08x", phtab[i].PAddr);
+		LOG(" .FileSize = 0x%08x", phtab[i].FileSize);
+		LOG(" .MemSize = 0x%08x", phtab[i].MemSize);
+		LOG(" .Flags = 0x%08x", phtab[i].Flags);
+		LOG(" .Align = 0x%08x", phtab[i].Align);
+		LOG(" }");
 		// Get Interpreter Name
 		if( phtab[i].Type == PT_INTERP )
 		{
@@ -106,24 +121,24 @@ tBinary *Elf_Load(int fp)
 		if(phtab[i].Type != PT_LOAD)	continue;
 		
 		// Find Base
-		if(phtab[i].VAddr < ret->Base)	ret->Base = phtab[i].VAddr;
-
-		k = 0;
+		if(phtab[i].VAddr < ret->Base)	ret->Base = phtab[i].VAddr;
 		
 		LOG("phtab[%i] = {VAddr:0x%x,Offset:0x%x,FileSize:0x%x}",
 			i, phtab[i].VAddr, phtab[i].Offset, phtab[i].FileSize);
 		
-		if( (phtab[i].FileSize & 0xFFF) < 0x1000 - (phtab[i].VAddr & 0xFFF) )
-			lastSize = phtab[i].FileSize;
-		else
+		//if( (phtab[i].FileSize & 0xFFF) < 0x1000 - (phtab[i].VAddr & 0xFFF) )
+		//	lastSize = phtab[i].FileSize;
+		//else
 			lastSize = (phtab[i].FileSize & 0xFFF) + (phtab[i].VAddr & 0xFFF);
-		lastSize &= 0xFFF;
+		//lastSize &= 0xFFF;
+		
+		//LOG("lastSize = 0x%x", lastSize);
 		
-		LOG("lastSize = 0x%x", lastSize);
+		lastSize = phtab[i].FileSize;
 		
 		// Get Pages
 		count = ( (phtab[i].VAddr&0xFFF) + phtab[i].FileSize + 0xFFF) >> 12;
-		for(;k<count;k++)
+		for( k = 0; k < count; k ++ )
 		{
 			ret->Pages[j+k].Virtual = phtab[i].VAddr + (k<<12);
 			ret->Pages[j+k].Physical = phtab[i].Offset + (k<<12);	// Store the offset in the physical address
@@ -139,6 +154,7 @@ tBinary *Elf_Load(int fp)
 				ret->Pages[j+k].Size = 4096;
 			LOG("ret->Pages[%i].Size = 0x%x", j+k, ret->Pages[j+k].Size);
 			ret->Pages[j+k].Flags = 0;
+			lastSize -= ret->Pages[j+k].Size;
 		}
 		count = (phtab[i].MemSize + 0xFFF) >> 12;
 		for(;k<count;k++)
@@ -272,7 +288,7 @@ int Elf_Relocate(void *Base)
 	// Parse Program Header to get Dynamic Table
 	phtab = Base + hdr->phoff;
 	iSegmentCount = hdr->phentcount;
-	for(i=0;i<iSegmentCount;i++)
+	for(i = 0; i < iSegmentCount; i ++ )
 	{
 		// Determine linked base address
 		if(phtab[i].Type == PT_LOAD && iRealBase > phtab[i].VAddr)
@@ -281,10 +297,10 @@ int Elf_Relocate(void *Base)
 		// Find Dynamic Section
 		if(phtab[i].Type == PT_DYNAMIC) {
 			if(dynamicTab) {
-				Warning("ELF", "Elf_Relocate - Multiple PT_DYNAMIC segments\n");
+				Log_Warning("ELF", "Elf_Relocate - Multiple PT_DYNAMIC segments\n");
 				continue;
 			}
-			dynamicTab = (void *) phtab[i].VAddr;
+			dynamicTab = (void *) (tVAddr) phtab[i].VAddr;
 			j = i;	// Save Dynamic Table ID
 			break;
 		}
@@ -292,7 +308,7 @@ int Elf_Relocate(void *Base)
 	
 	// Check if a PT_DYNAMIC segement was found
 	if(!dynamicTab) {
-		Warning("ELF", "Elf_Relocate: No PT_DYNAMIC segment in image, returning\n");
+		Log_Warning("ELF", "Elf_Relocate: No PT_DYNAMIC segment in image, returning\n");
 		LEAVE('x', hdr->entrypoint);
 		return hdr->entrypoint;
 	}
@@ -313,20 +329,20 @@ int Elf_Relocate(void *Base)
 		// --- Symbol Table ---
 		case DT_SYMTAB:
 			dynamicTab[j].d_val += iBaseDiff;
-			dynsymtab = (void*)(dynamicTab[j].d_val);
+			dynsymtab = (void*) (tVAddr) dynamicTab[j].d_val;
 			hdr->misc.SymTable = dynamicTab[j].d_val;	// Saved in unused bytes of ident
 			break;
 		
 		// --- String Table ---
 		case DT_STRTAB:
 			dynamicTab[j].d_val += iBaseDiff;
-			dynstrtab = (void*)(dynamicTab[j].d_val);
+			dynstrtab = (void*) (tVAddr) dynamicTab[j].d_val;
 			break;
 		
 		// --- Hash Table --
 		case DT_HASH:
 			dynamicTab[j].d_val += iBaseDiff;
-			iSymCount = ((Uint*)(dynamicTab[j].d_val))[1];
+			iSymCount = ((Uint*)((tVAddr)dynamicTab[j].d_val))[1];
 			hdr->misc.HashTable = dynamicTab[j].d_val;	// Saved in unused bytes of ident
 			break;
 		}
@@ -334,7 +350,7 @@ int Elf_Relocate(void *Base)
 
 
 	// Alter Symbols to true base
-	for(i=0;i<iSymCount;i++)
+	for(i = 0; i < iSymCount; i ++)
 	{
 		dynsymtab[i].value += iBaseDiff;
 		dynsymtab[i].nameOfs += (Uint)dynstrtab;
@@ -356,10 +372,10 @@ int Elf_Relocate(void *Base)
 		// --- Needed Library ---
 		case DT_NEEDED:
 			libPath = dynstrtab + dynamicTab[j].d_val;
-			LOG("Required Library '%s' (IGNORED in kernel mode)\n", libPath);
+			Log_Notice("ELF", "%p - Required Library '%s' (Ignored in kernel mode)\n", Base, libPath);
 			break;
 		// --- PLT/GOT ---
-		case DT_PLTGOT:	pltgot = (void*)iBaseDiff+(dynamicTab[j].d_val);	break;
+		case DT_PLTGOT:	pltgot = (void*)(iBaseDiff+dynamicTab[j].d_val);	break;
 		case DT_JMPREL:	plt = (void*)(iBaseDiff+dynamicTab[j].d_val);	break;
 		case DT_PLTREL:	pltType = dynamicTab[j].d_val;	break;
 		case DT_PLTRELSZ:	pltSz = dynamicTab[j].d_val;	break;
@@ -368,6 +384,7 @@ int Elf_Relocate(void *Base)
 		case DT_REL:	rel = (void*)(iBaseDiff + dynamicTab[j].d_val);	break;
 		case DT_RELSZ:	relSz = dynamicTab[j].d_val;	break;
 		case DT_RELENT:	relEntSz = dynamicTab[j].d_val;	break;
+		
 		case DT_RELA:	rela = (void*)(iBaseDiff + dynamicTab[j].d_val);	break;
 		case DT_RELASZ:	relaSz = dynamicTab[j].d_val;	break;
 		case DT_RELAENT:	relaEntSz = dynamicTab[j].d_val;	break;
@@ -406,6 +423,7 @@ int Elf_Relocate(void *Base)
 		{
 			Elf32_Rel	*pltRel = plt;
 			j = pltSz / sizeof(Elf32_Rel);
+			LOG("PLT Rel - plt = %p, pltSz = %i (%i ents)", plt, pltSz, j);
 			for(i = 0; i < j; i++)
 			{
 				ptr = (void*)(iBaseDiff + pltRel[i].r_offset);
@@ -418,9 +436,10 @@ int Elf_Relocate(void *Base)
 		{
 			Elf32_Rela	*pltRela = plt;
 			j = pltSz / sizeof(Elf32_Rela);
+			LOG("PLT RelA - plt = %p, pltSz = %i (%i ents)", plt, pltSz, j);
 			for(i=0;i<j;i++)
 			{
-				ptr = (void*)((Uint)Base + pltRela[i].r_offset);
+				ptr = (void*)(iBaseDiff + pltRela[i].r_offset);
 				if( !Elf_Int_DoRelocate(pltRela[i].r_info, ptr, pltRela[i].r_addend, dynsymtab, (Uint)Base) ) {
 					bFailed = 1;
 				}
@@ -463,7 +482,7 @@ int Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symta
 		if( !Elf_GetSymbol((void*)base, sSymName, &val) )	// Search this binary first
 			if( !Binary_GetSymbol( sSymName, &val ) )
 				return 0;
-		//LOG("R_386_32 *0x%x += 0x%x('%s')", ptr, val, sSymName);
+		LOG("%08x R_386_32 *0x%x += 0x%x('%s')", r_info, ptr, val, sSymName);
 		*ptr = val + addend;
 		break;
 		
@@ -472,7 +491,7 @@ int Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symta
 		if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )
 			if( !Binary_GetSymbol( sSymName, &val ) )
 				return 0;
-		//LOG("R_386_PC32 *0x%x = 0x%x + 0x%x('%s') - 0x%x", ptr, *ptr, val, sSymName, (Uint)ptr );
+		LOG("%08x R_386_PC32 *0x%x = 0x%x + 0x%x('%s') - 0x%x", r_info, ptr, *ptr, val, sSymName, (Uint)ptr );
 		// TODO: Check if it needs the true value of ptr or the compiled value
 		// NOTE: Testing using true value
 		*ptr = val + addend - (Uint)ptr;
@@ -483,7 +502,7 @@ int Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symta
 		if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )
 			if( !Binary_GetSymbol( sSymName, &val ) )
 				return 0;
-		//LOG("R_386_GLOB_DAT *0x%x = 0x%x (%s)", ptr, val, sSymName);
+		LOG("%08x R_386_GLOB_DAT *0x%x = 0x%x (%s)", r_info, ptr, val, sSymName);
 		*ptr = val;
 		break;
 	
@@ -492,13 +511,13 @@ int Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symta
 		if( !Elf_GetSymbol( (void*)base, sSymName, &val ) )
 			if( !Binary_GetSymbol( sSymName, &val ) )
 				return 0;
-		//LOG("R_386_JMP_SLOT *0x%x = 0x%x (%s)", ptr, val, sSymName);
+		LOG("%08x R_386_JMP_SLOT *0x%x = 0x%x (%s)", r_info, ptr, val, sSymName);
 		*ptr = val;
 		break;
 
 	// Base Address (B+A)
 	case R_386_RELATIVE:
-		//LOG("R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, base, addend);
+		LOG("%08x R_386_RELATIVE *0x%x = 0x%x + 0x%x", r_info, ptr, base, addend);
 		*ptr = base + addend;
 		break;
 		
@@ -541,7 +560,7 @@ int Elf_GetSymbol(void *Base, char *Name, Uint *ret)
 	// Check Bucket
 	i = pBuckets[ iNameHash ];
 	if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[i].name, Name) == 0) {
-		*ret = symtab[ i ].value;
+		if(ret)	*ret = symtab[ i ].value;
 		return 1;
 	}
 	
@@ -550,7 +569,7 @@ int Elf_GetSymbol(void *Base, char *Name, Uint *ret)
 	{
 		i = pChains[i];
 		if(symtab[i].shndx != SHN_UNDEF && strcmp(symtab[ i ].name, Name) == 0) {
-			*ret = symtab[ i ].value;
+			if(ret)	*ret = symtab[ i ].value;
 			return 1;
 		}
 	}