diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:56:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:56:43 +0000 |
commit | 8be98142ecdba40b2ea9be10b11a23f4e6b67b05 (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /element_detection.cc | |
parent | b77318bc7ecfba25e4966b56b9e9ab593925ad9d (diff) | |
parent | 7be427590935bc88198d32004449ccfcf60b60d4 (diff) | |
download | zucchini-8be98142ecdba40b2ea9be10b11a23f4e6b67b05.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959 am: d9eed84a58 am: 58b4d19a6b am: 7be4275909
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Ifdb1f7882cc237258a3395d28158d50bb4b43136
Diffstat (limited to 'element_detection.cc')
-rw-r--r-- | element_detection.cc | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/element_detection.cc b/element_detection.cc index 356c0d7..5548610 100644 --- a/element_detection.cc +++ b/element_detection.cc @@ -9,6 +9,7 @@ #include "components/zucchini/buildflags.h" #include "components/zucchini/disassembler.h" #include "components/zucchini/disassembler_no_op.h" +#include "components/zucchini/patch_utils.h" #if BUILDFLAG(ENABLE_DEX) #include "components/zucchini/disassembler_dex.h" @@ -134,6 +135,40 @@ std::unique_ptr<Disassembler> MakeDisassemblerOfType(ConstBufferView image, } } +uint16_t DisassemblerVersionOfType(ExecutableType exe_type) { + switch (exe_type) { +#if BUILDFLAG(ENABLE_WIN) + case kExeTypeWin32X86: + return DisassemblerWin32X86::kVersion; + case kExeTypeWin32X64: + return DisassemblerWin32X64::kVersion; +#endif // BUILDFLAG(ENABLE_WIN) +#if BUILDFLAG(ENABLE_ELF) + case kExeTypeElfX86: + return DisassemblerElfX86::kVersion; + case kExeTypeElfX64: + return DisassemblerElfX64::kVersion; + case kExeTypeElfAArch32: + return DisassemblerElfAArch32::kVersion; + case kExeTypeElfAArch64: + return DisassemblerElfAArch64::kVersion; +#endif // BUILDFLAG(ENABLE_ELF) +#if BUILDFLAG(ENABLE_DEX) + case kExeTypeDex: + return DisassemblerDex::kVersion; +#endif // BUILDFLAG(ENABLE_DEX) +#if BUILDFLAG(ENABLE_ZTF) + case kExeTypeZtf: + return DisassemblerZtf::kVersion; +#endif // BUILDFLAG(ENABLE_ZTF) + case kExeTypeNoOp: + return DisassemblerNoOp::kVersion; + default: + // If an architecture is disabled then null is handled gracefully. + return kInvalidVersion; + } +} + absl::optional<Element> DetectElementFromDisassembler(ConstBufferView image) { std::unique_ptr<Disassembler> disasm = MakeDisassemblerWithoutFallback(image); if (disasm) |