Rework API for getting at instructions

[frida/frida.git] / src / disassembler / Instruction.hxx

diff --git a/src/disassembler/Instruction.hxx b/src/disassembler/Instruction.hxx
index afb5193a158ad1ad7d698bffeb5a49f3585e094f..e79b24f38408ded9dfe060699914014a6810d3fb 100644 (file)
--- a/src/disassembler/Instruction.hxx
+++ b/src/disassembler/Instruction.hxx
@@ -1,6 +1,23 @@
+#ifndef INCLUDE__Instruction_hxx_
+#define INCLUDE__Instruction_hxx_
 
+#include <vector>
+#include <cstdint>
+#include <string>
 
 class Instruction {
 public:
+       Instruction(uint64_t address, const std::string& text, const std::vector<uint8_t>& bytes, const std::string& reference)
+               : address(address), text(text), bytes(bytes), reference(reference) {}
+       uint64_t getAddress() const {return address;}
+       const std::string& getText() const {return text;}
+       const std::vector<uint8_t>& getBytes() const {return bytes;}
+       const std::string& getReference() const {return reference;}
 private:
+       uint64_t address;
+       std::string text;
+       std::vector<uint8_t> bytes;
+       std::string reference;
 };
+
+#endif /* INCLUDE__Instruction_hxx_ */