FCL/sftools/dev/build: comparison bintools/elftools/elftran/elf

equal deleted inserted replaced

-:c7c26511138f
+:360bd6b35136
 #include <string.h>
 #include <stdlib.h>
 #include <e32std.h>
-#include <elfdefs.h>
+#include "elfdefs.h"
 #include "elfdll.h"
 #include "elffile.h"
-#include <h_utl.h>
+#include "h_utl.h"
 #include <e32ldr.h>
-ELFFile::ELFDllData::ELFDllData(ELFFile * f)
+ELFFile::ELFDllData::ELFDllData(ELFFile * f) :
-:
+iElfFile(f), iDynStrTab(0), iDynStrTabSize(0), iDynSymTab(0),
-iElfFile(f),
+		iSymSize(0), iRela(0), iRelaSz(0), iRelaEnt(0),
+		iRel(0), iRelSz(0), iRelEnt(0),
-iDynStrTab(0),
+		iHashTable(0), iNamedExportSymbolHead(0),  iNamedExportCount(0),
-iDynStrTabSize(0),
+		iSymStringTableSize(0),iStringNameOffset(0),
-iDynSymTab(0),
+		iDepRecords(0), iDepRecordsTail(0),iNeededDllNames(0),iNeededDllNamesTail(0),
+		iOrdZeroRec(0), iNamedLookupEnabled(0),
-iSymSize(0),
+		iDllHead(0), iDllTail(0),
-iRela(0),
+		iNumberOfImports(0),  iNumberOfExports(0), iNumberOfImportDlls(0),
-iRelaSz(0),
+		iStringTableSize(0), iNumberOfRelocs(0), iNumberOfCodeRelocs(0),
-iRelaEnt(0),
+		iNumberOfDataRelocs(0)
-iRel(0),
-iRelSz(0),
-iRelEnt(0),
-iHashTable(0),
-iNamedExportSymbolHead(0),
-iNamedExportCount(0),
-iSymStringTableSize(0),
-iStringNameOffset(0),
-iDepRecords(0),
-iDepRecordsTail(0),
-iNeededDllNames(0),
-iNeededDllNamesTail(0),
-iOrdZeroRec(0),
-iNamedLookupEnabled(0),
-iDllHead(0),
-iDllTail(0),
-iNumberOfImports(0),
-iNumberOfExports(0),
-iNumberOfImportDlls(0),
-iStringTableSize(0),
-iNumberOfRelocs(0),
-iNumberOfCodeRelocs(0),
-iNumberOfDataRelocs(0)
 		{
 		}
 ELFFile::ELFDllData::~ELFDllData()
 	{
 					errors++;
 					}
 			}
 	// Set up export info
 	if (InitExportInfo())
 	       {
-	       TText * sym = (TText *)"_E32Startup";
 	       // If _E32Startup is defined then this is not a DLL
-	       iImageIsDll = !iElfFile->SymbolPresent(sym);
+	       iImageIsDll = !iElfFile->SymbolPresent("_E32Startup");
 	       }
 	if (errors > 0) return EFalse;
 	return ETrue;
 	}
 	nImports++;
 iTail->iNext = s;
 iTail = s;
 }
-static unsigned long elf_hash(const unsigned char *name)
+static unsigned long elf_hash(const unsigned char* name)
 {
 unsigned long h, g;
 for (h = 0; *name != 0; ++name)
 	        {
 			h = (h << 4) + *name;
 			h &= ~g;
 			}
 	return h;
 }
-Elf32_Word ELFFile::ELFDllData::FindSymbolIndex(TText * s)
+Elf32_Word ELFFile::ELFDllData::FindSymbolIndex(const char* s)
 {
-	TUint h = elf_hash(s);
+	TUint h = elf_hash((const unsigned char*)s);
 	TUint nb = iHashTable[0].nBuckets;
 	TUint probe = h%nb;
 	Elf32_Sword * bucket = ELFADDR(Elf32_Sword, iHashTable, sizeof(Elf32_HashTable));
 	Elf32_Sword * chain = ELFADDR(Elf32_Sword, bucket, nb * sizeof(Elf32_Sword));
 	Elf32_Sword idx = bucket[probe];
 	do
 			{
-			if (!strcmp(ELFADDR(char, iDynStrTab, iDynSymTab[idx].st_name), (char *)s)) return idx;
+			if (!strcmp(ELFADDR(char, iDynStrTab, iDynSymTab[idx].st_name), s)) return idx;
 			idx = chain[idx];
 			} while (idx > 0);
 	if (idx == 0) idx = -1;
 	return idx;
 	}
 TBool ELFFile::ELFDllData::InitExportInfo()
 	{
 	memset(&iSymInfoHdr, 0, sizeof(iSymInfoHdr));
-	TText * exp = (TText *)EXPORTTABLENAME;
+	if ((iExportTableSymIdx = FindSymbolIndex(EXPORTTABLENAME)) != (Elf32_Word)-1)
-	if ( int(iExportTableSymIdx = FindSymbolIndex(exp)) != -1 )
+			{
-			{
+			iExportTableSizeSymIdx = FindSymbolIndex(EXPORTTABLESIZENAME);
-			TText * exps = (TText *)EXPORTTABLESIZENAME;
-			iExportTableSizeSymIdx = FindSymbolIndex(exps);
 			//TUint offset = iDynSymTab[iExportTableSizeSymIdx].st_value - (TUint)code;
 			Elf32_Word * pNumberOfExports = iElfFile->CodePtrFromAddr(iDynSymTab[iExportTableSizeSymIdx].st_value);
 			iNumberOfExports = * pNumberOfExports;
 			iImageIsDll = ETrue;
 			return ETrue;
 					// sanity check: segment should be the code segment
 					if (!iElfFile->CodeSegmentP(segment))
 							{
 							Print(EPeError, "Import relocation does not refer to code segment.\n");
+							Print(EPeError, "Dll: %s\n", sym->iDll);
+							Print(EPeError, "Ordinal: %d\n", sym->iOrd);
+							Print(EPeError, "DLL name: %s\n", dll->iName);
 							aSize = 0;
 							return 0;
 							}
 					// This field is misnamed because it is actually given as a virtual address in
 					// We store there reloc offset in the top 16 bits of the 'reloc info'.
 					// NB the ELF reloc values should only ever be multiples of 4. So we could optimize here,
 					// but we won't.
 					TUint relocVal = *relocAddr;
 					TUint importOrdinal = sym->iOrd;
-					if (relocVal > 0xFFFF)
+					if (relocVal > 0xFFFF) {
 							Print(EPeError, "ELF relocation exceeds E32Image limit of 64K.\n");
-					if (importOrdinal > 0xFFFF)
+							Print(EPeError, "Dll: %s\n", sym->iDll);
+							Print(EPeError, "Ordinal: %d\n", sym->iOrd);
+							Print(EPeError, "DLL name: %s\n", dll->iName);
+					}
+					if (importOrdinal > 0xFFFF) {
 							Print(EPeError, "Import ordinal exceeds E32Image limit of 64K.\n");
+							Print(EPeError, "Dll: %s\n", sym->iDll);
+							Print(EPeError, "Ordinal: %d\n", sym->iOrd);
+							Print(EPeError, "DLL name: %s\n", dll->iName);
+					}
 					*rp = segOffset;
 					// eek !! surgery on the code segment....
 					*relocAddr = (relocVal<<16) | importOrdinal;
 					}
 	//
 	{
 	TInt nrelocs = iRelSz/iRelEnt;
 	TInt SrcSegIdx = -1;
+	TInt idx = 0;
 	TInt cidx = 0;
 	TInt didx = 0;
-	for (TInt idx = 0; idx < nrelocs; idx++)
+	for (idx = 0, cidx = 0, didx = 0; idx < nrelocs; idx++)
 	        {
 			Elf32_Rel * rel = &iRel[idx];
 			if (ELF32_R_TYPE(rel->r_info) == R_ARM_RABS32)
 					{
 TBool ELFFile::ELFDllData::SetupSymbolValues()
 {
 	NamedExportSymbol *aSym, *aPrevSym;
-	if( int(iExportTableSymIdx) == -1 || int(iExportTableSizeSymIdx) == -1)
+	if( iExportTableSymIdx == (Elf32_Word)-1 || iExportTableSizeSymIdx == (Elf32_Word)-1)
 		return FALSE;
 	// Fetch the 'export table' symbol from the dynamic symbol table.
 	Elf32_Sym *aElfExpTbl = &iDynSymTab[iExportTableSymIdx];

changeset 590	360bd6b35136
parent 0	044383f39525