X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbin%2Felf.c;h=2f43eee85904159fce69b7fd3eae637bf7749d74;hb=f3d0d7fcf0496a63625c92e5ab95471e202e958e;hp=745c2c7ab141a575925050756b6036e6764b2662;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858;p=tpg%2Facess2.git

diff --git a/Kernel/bin/elf.c b/Kernel/bin/elf.c
index 745c2c7a..2f43eee8 100644
--- a/Kernel/bin/elf.c
+++ b/Kernel/bin/elf.c
@@ -1,33 +1,20 @@
 /*
-Acess v0.1
-ELF Executable Loader Code
-*/
-#include <common.h>
+ * Acess v0.1
+ * ELF Executable Loader Code
+ */
+#define DEBUG	0
+#include <acess.h>
 #include <binary.h>
-#include "bin_elf.h"
+#include "elf.h"
 
-#define DEBUG	0
 #define DEBUG_WARN	1
 
-#if DEBUG
-# define DEBUGS(v...)	Log(v)
-#else
-# define DEBUGS(v...)
-# undef ENTER
-# undef LOG
-# undef LEAVE
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-#endif
-
-
 // === PROTOTYPES ===
 tBinary	*Elf_Load(int fp);
  int	Elf_Relocate(void *Base);
- int	Elf_GetSymbol(void *Base, char *Name, Uint *ret);
+ int	Elf_GetSymbol(void *Base, const char *Name, Uint *ret);
  int	Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symtab, Uint base);
-Uint	Elf_Int_HashString(char *str);
+Uint	Elf_Int_HashString(const char *str);
 
 // === GLOBALS ===
 tBinaryType	gELF_Info = {
@@ -47,7 +34,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);
@@ -69,7 +56,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);
 	
@@ -88,7 +80,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
@@ -100,7 +92,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 )
 		{
@@ -118,24 +120,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
@@ -151,6 +153,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++)
@@ -282,9 +285,9 @@ int Elf_Relocate(void *Base)
 	ENTER("pBase", Base);
 	
 	// Parse Program Header to get Dynamic Table
-	phtab = Base + hdr->phoff;
+	phtab = (void *)( (tVAddr)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)
@@ -293,10 +296,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;
 		}
@@ -304,7 +307,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;
 	}
@@ -325,20 +328,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;
 		}
@@ -346,7 +349,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;
@@ -368,10 +371,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;
@@ -380,6 +383,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;
@@ -418,6 +422,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);
@@ -430,9 +435,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;
 				}
@@ -475,7 +481,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;
 		
@@ -484,7 +490,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;
@@ -495,7 +501,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;
 	
@@ -504,13 +510,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;
 		
@@ -522,10 +528,10 @@ int Elf_Int_DoRelocate(Uint r_info, Uint32 *ptr, Uint32 addend, Elf32_Sym *symta
 }
 
 /**
- * \fn int Elf_GetSymbol(void *Base, char *name, Uint *ret)
+ * \fn int Elf_GetSymbol(void *Base, const char *name, Uint *ret)
  * \brief Get a symbol from the loaded binary
  */
-int Elf_GetSymbol(void *Base, char *Name, Uint *ret)
+int Elf_GetSymbol(void *Base, const char *Name, Uint *ret)
 {
 	Elf32_Ehdr	*hdr = (void*)Base;
 	Elf32_Sym	*symtab;
@@ -553,7 +559,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;
 	}
 	
@@ -562,7 +568,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;
 		}
 	}
@@ -575,7 +581,7 @@ int Elf_GetSymbol(void *Base, char *Name, Uint *ret)
  * \param str	String to hash
  * \return Hash value
  */
-Uint Elf_Int_HashString(char *str)
+Uint Elf_Int_HashString(const char *str)
 {
 	Uint	h = 0, g;
 	while(*str)