(elfcpp) remove old elf lib and any reference of it

Author: StanHash

CMakeLists.txt

@@ -33,11 +33,6 @@ set(LYN_SOURCE_LIST
 	core/binary_file.h
 	core/binary_file.cpp
 
-	elf/raw_elf.h
-
-	elf/elf_file.h
-	elf/elf_file.cpp
-
 	ea/event_code.h
 	ea/event_code.cpp
 

core/event_object.cpp

@@ -261,156 +261,6 @@ void event_object::append_from_elf(const char* fileName) {
 	}
 }
 
-void event_object::append_from_elf(const elf_file& elfFile) {
-	std::vector<section_data> newSections(elfFile.sections().size());
-	std::vector<bool> outMap(elfFile.sections().size(), false);
-
-	auto getLocalSymbolName = [this] (int section, int index) -> std::string {
-		std::string result;
-		result.reserve(4 + 8 + 4 + 4);
-
-		result.append("_L");
-
-		util::append_hex(result, size());
-		result.append("_");
-		util::append_hex(result, section);
-		result.append("_");
-		util::append_hex(result, index);
-
-		return result;
-	};
-
-	auto getGlobalSymbolName = [this] (const char* name) -> std::string {
-		std::string result(name);
-		int find = 0;
-
-		while ((find = result.find('.')) != std::string::npos)
-			result[find] = '_';
-
-		return result;
-	};
-
-	// Initializing written Sections from relevant elf sections
-
-	for (int i=0; i<newSections.size(); ++i) {
-		auto& elfSection = elfFile.sections()[i];
-
-		if ((elfSection.sh_type == elf::SHT_PROGBITS)) {
-			if ((elfSection.sh_flags & elf::SHF_ALLOC) && !(elfSection.sh_flags & elf::SHF_WRITE)) {
-				auto& sectionData = newSections[i];
-
-				sectionData.set_name(elfFile.get_section_name(elfSection));
-				outMap[i] = true;
-				sectionData.load_from_other(elfFile, elfSection.sh_offset, elfSection.sh_size);
-			}
-		}
-	}
-
-	// Initializing labels, mappings & relocations from other elf sections
-
-	for (int sectionIndex=0; sectionIndex<elfFile.sections().size(); ++sectionIndex) {
-		auto& elfSection = elfFile.sections()[sectionIndex];
-
-		if (elfSection.sh_type == elf::SHT_SYMTAB) {
-			int symbolCount = elfSection.sh_size / elfSection.sh_entsize;
-
-			auto& nameElfSection = elfFile.sections()[elfSection.sh_link];
-
-			for (int i=0; i<symbolCount; ++i) {
-				auto sym = elfFile.symbol(elfSection, i);
-
-				if (sym.st_shndx >= newSections.size()) {
-					if ((sym.st_shndx == elf::SHN_ABS) && (sym.bind() == elf::STB_GLOBAL))
-						mAbsoluteSymbols.push_back({ elfFile.string(nameElfSection, sym.st_name), sym.st_value, false });
-					continue;
-				}
-
-				if (!outMap[sym.st_shndx])
-					continue;
-
-				auto& sectionData = newSections[sym.st_shndx];
-
-				std::string symbolName = elfFile.string(nameElfSection, sym.st_name);
-
-				if (sym.type() == elf::STT_NOTYPE && sym.bind() == elf::STB_LOCAL) {
-					std::string subString = symbolName.substr(0, 3);
-
-					if ((symbolName == "$t") || (subString == "$t.")) {
-						sectionData.set_mapping(sym.st_value, mapping::Thumb);
-						continue;
-					} else if ((symbolName == "$a") || (subString == "$a.")) {
-						sectionData.set_mapping(sym.st_value, mapping::ARM);
-						continue;
-					} else if ((symbolName == "$d") || (subString == "$d.")) {
-						sectionData.set_mapping(sym.st_value, mapping::Data);
-						continue;
-					}
-				}
-
-				if (sym.bind() == elf::STB_LOCAL)
-					symbolName = getLocalSymbolName(sectionIndex, i);
-				else
-					symbolName = getGlobalSymbolName(symbolName.c_str());
-
-				sectionData.symbols().push_back({ symbolName, sym.st_value, (sym.bind() == elf::STB_LOCAL) });
-			}
-		} else if (elfSection.sh_type == elf::SHT_REL) {
-			int relCount = elfSection.sh_size / elfSection.sh_entsize;
-
-			auto& symbolSection = elfFile.sections()[elfSection.sh_link];
-			auto& symbolNameSection = elfFile.sections()[symbolSection.sh_link];
-
-			auto& sectionData = newSections[elfSection.sh_info];
-
-			for (int i=0; i<relCount; ++i) {
-				auto rel  = elfFile.rel(elfSection, i);
-				auto sym  = elfFile.symbol(symbolSection, rel.symId());
-				std::string name = elfFile.string(symbolNameSection, sym.st_name);
-
-				if (sym.bind() == elf::STB_LOCAL)
-					name = getLocalSymbolName(elfSection.sh_link, rel.symId());
-				else
-					name = getGlobalSymbolName(name.c_str());
-
-				sectionData.relocations().push_back({ std::string(name), 0, rel.type(), rel.r_offset });
-			}
-		} else if (elfSection.sh_type == elf::SHT_RELA) {
-			int relCount = elfSection.sh_size / elfSection.sh_entsize;
-
-			auto& symbolSection = elfFile.sections()[elfSection.sh_link];
-			auto& symbolNameSection = elfFile.sections()[symbolSection.sh_link];
-
-			auto& sectionData = newSections[elfSection.sh_info];
-
-			for (int i=0; i<relCount; ++i) {
-				auto rela = elfFile.rela(elfSection, i);
-				auto sym  = elfFile.symbol(symbolSection, rela.symId());
-				std::string name = elfFile.string(symbolNameSection, sym.st_name);
-
-				if (sym.bind() == elf::STB_LOCAL)
-					name = getLocalSymbolName(elfSection.sh_link, rela.symId());
-				else
-					name = getGlobalSymbolName(name.c_str());
-
-				sectionData.relocations().push_back({ std::string(name), rela.r_addend, rela.type(), rela.r_offset });
-			}
-		}
-	}
-
-	// Remove empty sections
-
-	newSections.erase(std::remove_if(newSections.begin(), newSections.end(), [] (const section_data& sectionData) {
-		return (sectionData.size()==0);
-	}), newSections.end());
-
-	// Create the ultimate lifeform
-
-	for (auto& newSection : newSections) {
-		combine_with(std::move(newSection));
-		ensure_aligned(4);
-	}
-}
-
 void event_object::try_transform_relatives() {
 	section_data trampolineData;
 

core/event_object.h

@@ -4,8 +4,6 @@
 #include "arm_relocator.h"
 #include "section_data.h"
 
-#include "../elf/elf_file.h"
-
 namespace lyn {
 
 class event_object : public section_data {
@@ -17,7 +15,6 @@ class event_object : public section_data {
 
 public:
 	void append_from_elf(const char* fName);
-	void append_from_elf(const lyn::elf_file& elfFile);
 
 	void try_transform_relatives();
 

core/section_data.h

@@ -3,8 +3,7 @@
 
 #include "binary_file.h"
 
-#include "../elf/elf_file.h"
-#include "../ea/event_section.h"
+#include "ea/event_section.h"
 
 namespace lyn {