X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fbin%2Felf.c;h=3209c044a5923ea257c832a92ac8563345d400b7;hb=89fba51f2433cf185831ee70554b99fe87e44a9d;hp=c516da3354b69d84f9cc48e4a6ac21d8a62d978a;hpb=a4ce2e60f783c9e71447edc03f20f937b8abf35a;p=tpg%2Facess2.git

diff --git a/Kernel/bin/elf.c b/Kernel/bin/elf.c
index c516da33..3209c044 100644
--- a/Kernel/bin/elf.c
+++ b/Kernel/bin/elf.c
@@ -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);
 	
@@ -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 )
 		{
@@ -282,7 +297,7 @@ int Elf_Relocate(void *Base)
 				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;
 		}
@@ -311,20 +326,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;
 		}
@@ -461,7 +476,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("R_386_32 *0x%x += 0x%x('%s')", ptr, val, sSymName);
 		*ptr = val + addend;
 		break;
 		
@@ -470,7 +485,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("R_386_PC32 *0x%x = 0x%x + 0x%x('%s') - 0x%x", 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;
@@ -481,7 +496,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("R_386_GLOB_DAT *0x%x = 0x%x (%s)", ptr, val, sSymName);
 		*ptr = val;
 		break;
 	
@@ -490,13 +505,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("R_386_JMP_SLOT *0x%x = 0x%x (%s)", 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("R_386_RELATIVE *0x%x = 0x%x + 0x%x", ptr, base, addend);
 		*ptr = base + addend;
 		break;
 		
@@ -539,7 +554,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;
 	}
 	
@@ -548,7 +563,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;
 		}
 	}