diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-01 19:27:26 -0700 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 02:38:22 +0000 |
| commit | a90c04389f86ed4363674e20b0d5f171dea7ebeb (patch) | |
| tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /element_detection.cc | |
| parent | f2da819cb37cb2376c917506fb1eb154ec61586a (diff) | |
| parent | 8bb965d29e918d0559589a215ff7f4bd0874bc08 (diff) | |
| download | zucchini-a90c04389f86ed4363674e20b0d5f171dea7ebeb.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-main' into dev
This performs a merge on upstream zucchini.
Change-Id: I8a4844407558d6f1e439939ee634fe17ed7a4e55
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) |