Skip to content

Commit

Permalink
Rename emitElf64 to emitElf and add it as a generic *nix file. (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wrwilliams
wrwilliams committed Jun 2, 2016
1 parent e09b7e8 commit 2a2f4f4
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 45 deletions.
9 changes: 3 additions & 6 deletions symtabAPI/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ set (SRC_LIST ${SRC_LIST}
src/parseDwarf.C
src/parseStab.C
src/LinkMap.C
src/emitElfStatic.C
src/emitElf.C
src/emitElfStatic.C
src/dwarfWalker.C
)

if (PLATFORM MATCHES x86_64 OR PLATFORM MATCHES amd64)
set (SRC_LIST ${SRC_LIST}
src/emitElf-64.C
src/emitElfStatic-x86.C
src/emitElfStatic-x86.C
src/relocationEntry-elf-x86.C
)
elseif (PLATFORM MATCHES i386)
Expand All @@ -68,19 +68,16 @@ set (SRC_LIST ${SRC_LIST}
)
elseif (PLATFORM MATCHES ppc64)
set (SRC_LIST ${SRC_LIST}
src/emitElf-64.C
src/emitElfStatic-ppc64.C
src/relocationEntry-elf-ppc64.C
)
elseif (PLATFORM MATCHES aarch64)
set (SRC_LIST ${SRC_LIST}
src/emitElf-64.C
src/emitElfStatic-aarch64.C
src/relocationEntry-elf-aarch64.C
)
else (TRUE)
set (SRC_LIST ${SRC_LIST}
src/emitElf-64.C
src/emitElfStatic-stub.C
src/relocationEntry-stub.C
)
Expand Down
1 change: 0 additions & 1 deletion symtabAPI/h/Symtab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ class SYMTAB_EXPORT Symtab : public LookupInterface,
friend class Variable;
friend class Module;
friend class Region;
friend class emitElf;
friend class emitElfStatic;
friend class emitWin;
friend class Aggregate;
Expand Down
14 changes: 7 additions & 7 deletions symtabAPI/src/Object-elf.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "debug.h"

#include "emitElf-64.h"
#include "emitElf.h"

#include "dwarfWalker.h"

Expand Down Expand Up @@ -322,10 +322,10 @@ const char* EXCEPT_NAME_ALT = ".except_table";


extern template
class Dyninst::SymtabAPI::emitElf64<ElfTypes32>;
class Dyninst::SymtabAPI::emitElf<ElfTypes32>;

extern template
class Dyninst::SymtabAPI::emitElf64<ElfTypes64>;
class Dyninst::SymtabAPI::emitElf<ElfTypes64>;

set<string> debugInfoSections = list_of(string(SYMTAB_NAME))
(string(STRTAB_NAME));
Expand Down Expand Up @@ -3966,15 +3966,15 @@ bool Object::emitDriver(Symtab *obj, string fName,
#endif
if (elfHdr->e_ident()[EI_CLASS] == ELFCLASS32)
{
Dyninst::SymtabAPI::emitElf64<Dyninst::SymtabAPI::ElfTypes32> *em =
new Dyninst::SymtabAPI::emitElf64<Dyninst::SymtabAPI::ElfTypes32>(elfHdr, isStripped, this, err_func_, obj);
Dyninst::SymtabAPI::emitElf<Dyninst::SymtabAPI::ElfTypes32> *em =
new Dyninst::SymtabAPI::emitElf<Dyninst::SymtabAPI::ElfTypes32>(elfHdr, isStripped, this, err_func_, obj);
if( !em->createSymbolTables(allSymbols) ) return false;
return em->driver(fName);
}
else if (elfHdr->e_ident()[EI_CLASS] == ELFCLASS64)
{
Dyninst::SymtabAPI::emitElf64<Dyninst::SymtabAPI::ElfTypes64> *em =
new Dyninst::SymtabAPI::emitElf64<Dyninst::SymtabAPI::ElfTypes64>(elfHdr, isStripped, this, err_func_, obj);
Dyninst::SymtabAPI::emitElf<Dyninst::SymtabAPI::ElfTypes64> *em =
new Dyninst::SymtabAPI::emitElf<Dyninst::SymtabAPI::ElfTypes64>(elfHdr, isStripped, this, err_func_, obj);
if( !em->createSymbolTables(allSymbols) ) return false;
return em->driver(fName);
}
Expand Down
50 changes: 25 additions & 25 deletions symtabAPI/src/emitElf-64.C → symtabAPI/src/emitElf.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


#include <algorithm>
#include "emitElf-64.h"
#include "emitElf.h"
#include "emitElfStatic.h"
#include "common/src/pathName.h"

Expand Down Expand Up @@ -115,7 +115,7 @@ void setVersion() {


template<class ElfTypes>
emitElf64<ElfTypes>::emitElf64(Elf_X *oldElfHandle_, bool isStripped_, Object *obj_, void (*err_func)(const char *),
emitElf<ElfTypes>::emitElf(Elf_X *oldElfHandle_, bool isStripped_, Object *obj_, void (*err_func)(const char *),
Symtab *st) :
oldElfHandle(oldElfHandle_), newElf(NULL), oldElf(NULL),
obj(st),
Expand Down Expand Up @@ -183,7 +183,7 @@ emitElf64<ElfTypes>::emitElf64(Elf_X *oldElfHandle_, bool isStripped_, Object *o
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::hasPHdrSectionBug()
bool emitElf<ElfTypes>::hasPHdrSectionBug()
{
if (movePHdrsFirst)
return false;
Expand All @@ -193,7 +193,7 @@ bool emitElf64<ElfTypes>::hasPHdrSectionBug()
}

template<typename ElfTypes>
bool emitElf64<ElfTypes>::cannotRelocatePhdrs()
bool emitElf<ElfTypes>::cannotRelocatePhdrs()
{
//#if defined(bug_phdrs_first_page)
return true;
Expand Down Expand Up @@ -276,7 +276,7 @@ std::string phdrTypeStr(Elf64_Word phdr_type) {
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::createElfSymbol(Symbol *symbol, unsigned strIndex, vector<Elf_Sym *> &symbols,
bool emitElf<ElfTypes>::createElfSymbol(Symbol *symbol, unsigned strIndex, vector<Elf_Sym *> &symbols,
bool dynSymFlag) {
Elf_Sym *sym = new Elf_Sym();
sym->st_name = strIndex;
Expand Down Expand Up @@ -438,7 +438,7 @@ bool emitElf64<ElfTypes>::createElfSymbol(Symbol *symbol, unsigned strIndex, vec

// Find the end of data/text segment
template<class ElfTypes>
void emitElf64<ElfTypes>::findSegmentEnds() {
void emitElf<ElfTypes>::findSegmentEnds() {
Elf_Phdr *tmp = ElfTypes::elf_getphdr(oldElf);
// Find the offset of the start of the text & the data segment
// The first LOAD segment is the text & the second LOAD segment
Expand All @@ -458,7 +458,7 @@ void emitElf64<ElfTypes>::findSegmentEnds() {
// Rename an old section. Lengths of old and new names must match.
// Only renames the FIRST matching section encountered.
template<class ElfTypes>
void emitElf64<ElfTypes>::renameSection(const std::string &oldStr, const std::string &newStr, bool renameAll) {
void emitElf<ElfTypes>::renameSection(const std::string &oldStr, const std::string &newStr, bool renameAll) {
assert(oldStr.length() == newStr.length());
for (unsigned k = 0; k < secNames.size(); k++) {
if (secNames[k] == oldStr) {
Expand All @@ -470,7 +470,7 @@ void emitElf64<ElfTypes>::renameSection(const std::string &oldStr, const std::st
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::driver(std::string fName) {
bool emitElf<ElfTypes>::driver(std::string fName) {
vector<ExceptionBlock *> exceptions;
obj->getAllExceptions(exceptions);
// cerr << "Dumping exception info: " << endl;
Expand All @@ -485,7 +485,7 @@ bool emitElf64<ElfTypes>::driver(std::string fName) {
int newfd;
Region *foundSec = NULL;
unsigned pgSize = getpagesize();
rewrite_printf("::driver for emitElf64\n");
rewrite_printf("::driver for emitElf\n");

string strtmpl = fName + "XXXXXX";
char buf[strtmpl.length() + 1];
Expand Down Expand Up @@ -886,7 +886,7 @@ bool emitElf64<ElfTypes>::driver(std::string fName) {


template<class ElfTypes>
void emitElf64<ElfTypes>::createNewPhdrRegion(dyn_hash_map<std::string, unsigned> &newNameIndexMapping) {
void emitElf<ElfTypes>::createNewPhdrRegion(dyn_hash_map<std::string, unsigned> &newNameIndexMapping) {
assert(!movePHdrsFirst);

unsigned phdr_size = oldEhdr->e_phnum * oldEhdr->e_phentsize;
Expand Down Expand Up @@ -933,7 +933,7 @@ void emitElf64<ElfTypes>::createNewPhdrRegion(dyn_hash_map<std::string, unsigned
}

template<class ElfTypes>
void emitElf64<ElfTypes>::fixPhdrs(unsigned &extraAlignSize) {
void emitElf<ElfTypes>::fixPhdrs(unsigned &extraAlignSize) {
unsigned pgSize = getpagesize();
Elf_Phdr *old = oldPhdr;

Expand Down Expand Up @@ -1173,7 +1173,7 @@ void emitElf64<ElfTypes>::fixPhdrs(unsigned &extraAlignSize) {

//This method updates the .dynamic section to reflect the changes to the relocation section
template<class ElfTypes>
void emitElf64<ElfTypes>::updateDynamic(unsigned tag, Elf_Addr val) {
void emitElf<ElfTypes>::updateDynamic(unsigned tag, Elf_Addr val) {
if (isStaticBinary) return;
// This is for REL/RELA if it doesnt already exist in the original binary;
dynamicSecData[tag][0]->d_tag = tag;
Expand Down Expand Up @@ -1212,7 +1212,7 @@ void emitElf64<ElfTypes>::updateDynamic(unsigned tag, Elf_Addr val) {
* new binary.
*/
template<class ElfTypes>
void emitElf64<ElfTypes>::updateSymbols(Elf_Data *symtabData, Elf_Data *strData, unsigned long loadSecsSize) {
void emitElf<ElfTypes>::updateSymbols(Elf_Data *symtabData, Elf_Data *strData, unsigned long loadSecsSize) {
unsigned pgSize = (unsigned) getpagesize();
if (symtabData && strData && loadSecsSize) {
Elf_Sym *symPtr = (Elf_Sym *) symtabData->d_buf;
Expand All @@ -1238,7 +1238,7 @@ void emitElf64<ElfTypes>::updateSymbols(Elf_Data *symtabData, Elf_Data *strData,
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::createLoadableSections(Elf_Shdr *&shdr, unsigned &extraAlignSize,
bool emitElf<ElfTypes>::createLoadableSections(Elf_Shdr *&shdr, unsigned &extraAlignSize,
dyn_hash_map<std::string, unsigned> &newNameIndexMapping,
unsigned &sectionNumber) {
Elf_Scn *newscn;
Expand Down Expand Up @@ -1518,7 +1518,7 @@ bool emitElf64<ElfTypes>::createLoadableSections(Elf_Shdr *&shdr, unsigned &extr
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::addSectionHeaderTable(Elf_Shdr *shdr) {
bool emitElf<ElfTypes>::addSectionHeaderTable(Elf_Shdr *shdr) {
Elf_Scn *newscn;
Elf_Data *newdata = NULL;
Elf_Shdr *newshdr;
Expand Down Expand Up @@ -1566,7 +1566,7 @@ bool emitElf64<ElfTypes>::addSectionHeaderTable(Elf_Shdr *shdr) {
}

template<class ElfTypes>
bool emitElf64<ElfTypes>::createNonLoadableSections(Elf_Shdr *&shdr) {
bool emitElf<ElfTypes>::createNonLoadableSections(Elf_Shdr *&shdr) {
Elf_Scn *newscn;
Elf_Data *newdata = NULL;
Elf_Shdr *newshdr;
Expand Down Expand Up @@ -1680,7 +1680,7 @@ bool emitElf64<ElfTypes>::createNonLoadableSections(Elf_Shdr *&shdr) {
* and add them to the list of new sections
*/
template<class ElfTypes>
bool emitElf64<ElfTypes>::createSymbolTables(vector<Symbol *> &allSymbols) {
bool emitElf<ElfTypes>::createSymbolTables(vector<Symbol *> &allSymbols) {
rewrite_printf(" createSymbolTables for %s \n", obj->name().c_str());
unsigned i;

Expand Down Expand Up @@ -2029,7 +2029,7 @@ bool emitElf64<ElfTypes>::createSymbolTables(vector<Symbol *> &allSymbols) {
}

template<class ElfTypes>
void emitElf64<ElfTypes>::createRelocationSections(std::vector<relocationEntry> &relocation_table, bool isDynRelocs,
void emitElf<ElfTypes>::createRelocationSections(std::vector<relocationEntry> &relocation_table, bool isDynRelocs,
dyn_hash_map<std::string, unsigned long> &dynSymNameMapping) {
vector<relocationEntry> newRels;
if (isDynRelocs && newSecs.size()) {
Expand Down Expand Up @@ -2207,7 +2207,7 @@ void emitElf64<ElfTypes>::createRelocationSections(std::vector<relocationEntry>
}

template<class ElfTypes>
void emitElf64<ElfTypes>::createSymbolVersions(Elf_Half *&symVers, char *&verneedSecData, unsigned &verneedSecSize,
void emitElf<ElfTypes>::createSymbolVersions(Elf_Half *&symVers, char *&verneedSecData, unsigned &verneedSecSize,
char *&verdefSecData,
unsigned &verdefSecSize, unsigned &dynSymbolNamesLength,
std::vector<std::string> &dynStrs) {
Expand Down Expand Up @@ -2312,7 +2312,7 @@ void emitElf64<ElfTypes>::createSymbolVersions(Elf_Half *&symVers, char *&vernee
}

template<class ElfTypes>
void emitElf64<ElfTypes>::createHashSection(Elf_Word *&hashsecData, unsigned &hashsecSize,
void emitElf<ElfTypes>::createHashSection(Elf_Word *&hashsecData, unsigned &hashsecSize,
std::vector<Symbol *> &dynSymbols) {

/* Save the original hash table entries */
Expand Down Expand Up @@ -2388,7 +2388,7 @@ void emitElf64<ElfTypes>::createHashSection(Elf_Word *&hashsecData, unsigned &ha
}

template<class ElfTypes>
void emitElf64<ElfTypes>::createDynamicSection(void *dynData, unsigned size, Elf_Dyn *&dynsecData, unsigned &dynsecSize,
void emitElf<ElfTypes>::createDynamicSection(void *dynData, unsigned size, Elf_Dyn *&dynsecData, unsigned &dynsecSize,
unsigned &dynSymbolNamesLength, std::vector<std::string> &dynStrs) {
dynamicSecData.clear();
Elf_Dyn *dyns = (Elf_Dyn *) dynData;
Expand Down Expand Up @@ -2537,15 +2537,15 @@ void emitElf64<ElfTypes>::createDynamicSection(void *dynData, unsigned size, Elf


template<class ElfTypes>
void emitElf64<ElfTypes>::log_elferror(void (*err_func)(const char *), const char *msg) {
void emitElf<ElfTypes>::log_elferror(void (*err_func)(const char *), const char *msg) {
const char *err = elf_errmsg(elf_errno());
err = err ? err : "(bad elf error)";
string str = string(err) + string(msg);
err_func(str.c_str());
}

template<class ElfTypes>
void emitElf64<ElfTypes>::addDTNeeded(string s) {
void emitElf<ElfTypes>::addDTNeeded(string s) {
if (find(DT_NEEDEDEntries.begin(), DT_NEEDEDEntries.end(), s) != DT_NEEDEDEntries.end())
return;
vector<string> &libs_rmd = object->libsRMd();
Expand All @@ -2557,7 +2557,7 @@ void emitElf64<ElfTypes>::addDTNeeded(string s) {

namespace Dyninst {
namespace SymtabAPI {
template class emitElf64<ElfTypes32>;
template class emitElf64<ElfTypes64>;
template class emitElf<ElfTypes32>;
template class emitElf<ElfTypes64>;
} // namespace SymtabAPI
} // namespace Dyninst
11 changes: 5 additions & 6 deletions symtabAPI/src/emitElf-64.h → symtabAPI/src/emitElf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,9 @@ namespace Dyninst {
Elf64_Xword makeRelocInfo(Elf64_Word sym, Elf64_Word type) { return ELF64_R_INFO(sym, type); }
};

template<class ElfTypes = ElfTypes64>
class emitElf64 : public ElfTypes {
template<class ElfTypes = ElfTypes64> class emitElf : public ElfTypes {
public:
emitElf64(Elf_X *pX, bool i, Object *pObject, void (*pFunction)(const char *), Symtab *pSymtab);
emitElf(Elf_X *pX, bool i, Object *pObject, void (*pFunction)(const char *), Symtab *pSymtab);

typedef typename ElfTypes::Elf_Ehdr Elf_Ehdr;
typedef typename ElfTypes::Elf_Phdr Elf_Phdr;
Expand All @@ -144,7 +143,7 @@ namespace Dyninst {
typedef typename ElfTypes::Elf_Verdef Elf_Verdef;
typedef typename ElfTypes::Elf_Verdaux Elf_Verdaux;

~emitElf64() {
~emitElf() {
if( linkedStaticData ) delete linkedStaticData;
}

Expand Down Expand Up @@ -271,8 +270,8 @@ namespace Dyninst {
bool isStaticBinary;

};
extern template class emitElf64<ElfTypes32>;
extern template class emitElf64<ElfTypes64>;
extern template class emitElf<ElfTypes32>;
extern template class emitElf<ElfTypes64>;

} // namespace SymtabAPI
} // namespace Dyninst
Expand Down

0 comments on commit 2a2f4f4

Please sign in to comment.