diff options
| -rw-r--r-- | lldb/include/lldb/Core/EmulateInstruction.h | 12 | ||||
| -rw-r--r-- | lldb/source/Core/EmulateInstruction.cpp | 9 |
2 files changed, 7 insertions, 14 deletions
diff --git a/lldb/include/lldb/Core/EmulateInstruction.h b/lldb/include/lldb/Core/EmulateInstruction.h index b728ffc979c..26df698683b 100644 --- a/lldb/include/lldb/Core/EmulateInstruction.h +++ b/lldb/include/lldb/Core/EmulateInstruction.h @@ -511,12 +511,12 @@ public: protected: ArchSpec m_arch; - void *m_baton; - ReadMemoryCallback m_read_mem_callback; - WriteMemoryCallback m_write_mem_callback; - ReadRegisterCallback m_read_reg_callback; - WriteRegisterCallback m_write_reg_callback; - lldb::addr_t m_addr; + void *m_baton = nullptr; + ReadMemoryCallback m_read_mem_callback = &ReadMemoryDefault; + WriteMemoryCallback m_write_mem_callback = &WriteMemoryDefault; + ReadRegisterCallback m_read_reg_callback = &ReadRegisterDefault; + WriteRegisterCallback m_write_reg_callback = &WriteRegisterDefault; + lldb::addr_t m_addr = LLDB_INVALID_ADDRESS; Opcode m_opcode; private: diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp index 3cf68cc61b1..62942fb715b 100644 --- a/lldb/source/Core/EmulateInstruction.cpp +++ b/lldb/source/Core/EmulateInstruction.cpp @@ -71,14 +71,7 @@ EmulateInstruction::FindPlugin(const ArchSpec &arch, return nullptr; } -EmulateInstruction::EmulateInstruction(const ArchSpec &arch) - : m_arch(arch), m_baton(nullptr), m_read_mem_callback(&ReadMemoryDefault), - m_write_mem_callback(&WriteMemoryDefault), - m_read_reg_callback(&ReadRegisterDefault), - m_write_reg_callback(&WriteRegisterDefault), - m_addr(LLDB_INVALID_ADDRESS) { - ::memset(&m_opcode, 0, sizeof(m_opcode)); -} +EmulateInstruction::EmulateInstruction(const ArchSpec &arch) : m_arch(arch) {} bool EmulateInstruction::ReadRegister(const RegisterInfo *reg_info, RegisterValue ®_value) { |
