diff options
author | Kelvin Zhang <zhangkelvin@google.com> | 2021-11-02 21:12:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-02 21:12:12 +0000 |
commit | d9eed84a58f90af50d84b02ca6a38d805b425a95 (patch) | |
tree | 0a310ca653ef73c547d80da63c87fcb2c0636bcb /disassembler_win32.h | |
parent | b93686f638f824fe552b36a468f76a21b2cfefe8 (diff) | |
parent | ddc43dc959af1bcc906755144b1a993233caa3b2 (diff) | |
download | zucchini-d9eed84a58f90af50d84b02ca6a38d805b425a95.tar.gz |
Merge remote-tracking branch 'aosp/upstream-main' into dev am: a90c04389f am: ddc43dc959
Original change: https://android-review.googlesource.com/c/platform/external/zucchini/+/1877854
Change-Id: Id5e02db627de075e9548615777d76b927e7fed56
Diffstat (limited to 'disassembler_win32.h')
-rw-r--r-- | disassembler_win32.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/disassembler_win32.h b/disassembler_win32.h index 77b65ac..dfb2533 100644 --- a/disassembler_win32.h +++ b/disassembler_win32.h @@ -26,6 +26,7 @@ class Rel32FinderX86; class Rel32FinderX64; struct Win32X86Traits { + static constexpr uint16_t kVersion = 1; static constexpr Bitness kBitness = kBit32; static constexpr ExecutableType kExeType = kExeTypeWin32X86; enum : uint16_t { kMagic = 0x10B }; @@ -39,6 +40,7 @@ struct Win32X86Traits { }; struct Win32X64Traits { + static constexpr uint16_t kVersion = 1; static constexpr Bitness kBitness = kBit64; static constexpr ExecutableType kExeType = kExeTypeWin32X64; enum : uint16_t { kMagic = 0x20B }; @@ -55,6 +57,7 @@ template <class TRAITS> class DisassemblerWin32 : public Disassembler { public: using Traits = TRAITS; + static constexpr uint16_t kVersion = Traits::kVersion; enum ReferenceType : uint8_t { kReloc, kAbs32, kRel32, kTypeCount }; // Applies quick checks to determine whether |image| *may* point to the start |