Split arch data into separate files.
Add an ArchEnum to express the arch of the Elf objects and Reg objects.
Split out the regs code into per arch pieces and generic parts.
Also, split out the header files for each arch.
Do not break out the test code yet, there isn't enough and it doesn't
help to maintain the tests.
Test: libunwindstack/libbacktrace/debuggerd unit tests pass.
Test: Running debuggerd -b <PIDS> yields valid data on bullhead.
Change-Id: If61f6c730c9ff2249f986b41de8c4d62f7158325
diff --git a/libunwindstack/Elf.cpp b/libunwindstack/Elf.cpp
index 5f307ed..025429f 100644
--- a/libunwindstack/Elf.cpp
+++ b/libunwindstack/Elf.cpp
@@ -31,7 +31,6 @@
#include <unwindstack/Regs.h>
#include "ElfInterfaceArm.h"
-#include "Machine.h"
#include "Symbols.h"
namespace unwindstack {
@@ -183,18 +182,15 @@
return nullptr;
}
- if (e_machine != EM_ARM && e_machine != EM_386) {
- // Unsupported.
- ALOGI("32 bit elf that is neither arm nor x86: e_machine = %d\n", e_machine);
- return nullptr;
- }
-
machine_type_ = e_machine;
if (e_machine == EM_ARM) {
+ arch_ = ARCH_ARM;
interface.reset(new ElfInterfaceArm(memory));
} else if (e_machine == EM_386) {
+ arch_ = ARCH_X86;
interface.reset(new ElfInterface32(memory));
} else {
+ // Unsupported.
ALOGI("32 bit elf that is neither arm nor x86: e_machine = %d\n", e_machine);
return nullptr;
}
@@ -203,12 +199,17 @@
if (!memory->ReadFully(EI_NIDENT + sizeof(Elf64_Half), &e_machine, sizeof(e_machine))) {
return nullptr;
}
- if (e_machine != EM_AARCH64 && e_machine != EM_X86_64) {
+
+ machine_type_ = e_machine;
+ if (e_machine == EM_AARCH64) {
+ arch_ = ARCH_ARM64;
+ } else if (e_machine == EM_X86_64) {
+ arch_ = ARCH_X86_64;
+ } else {
// Unsupported.
ALOGI("64 bit elf that is neither aarch64 nor x86_64: e_machine = %d\n", e_machine);
return nullptr;
}
- machine_type_ = e_machine;
interface.reset(new ElfInterface64(memory));
}