[haiku-commits] haiku: hrev48289 - src/apps/debugger/arch/x86_64/disasm
- From: anevilyak@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 13 Nov 2014 03:55:07 +0100 (CET)
hrev48289 adds 1 changeset to branch 'master'
old head: dc257d16035f6a2cafeae53a49afd468b1b1a33f
new head: 55ae46933ba4703c0bbaa9ef807b815e208e2ca4
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=55ae469+%5Edc257d1
----------------------------------------------------------------------------
55ae469: Debugger: Adapt x86_64 disassembler to newer udis API.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48289
Commit: 55ae46933ba4703c0bbaa9ef807b815e208e2ca4
URL: http://cgit.haiku-os.org/haiku/commit/?id=55ae469
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Thu Nov 13 02:53:48 2014 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 3 deletions(-)
src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp | 8 +++++---
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
b/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
index 785425b..3c32a10 100644
--- a/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
+++ b/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
@@ -164,9 +164,10 @@ DisassemblerX8664::GetNextInstructionInfo(InstructionInfo&
_info,
instruction_type type = INSTRUCTION_TYPE_OTHER;
target_addr_t targetAddress = 0;
- if (fUdisData->mnemonic == UD_Icall)
+ ud_mnemonic_code mnemonic = ud_insn_mnemonic(fUdisData);
+ if (mnemonic == UD_Icall)
type = INSTRUCTION_TYPE_SUBROUTINE_CALL;
- else if (fUdisData->mnemonic == UD_Ijmp)
+ else if (mnemonic == UD_Ijmp)
type = INSTRUCTION_TYPE_JUMP;
if (state != NULL)
targetAddress = GetInstructionTargetAddress(state);
@@ -186,7 +187,8 @@ DisassemblerX8664::GetNextInstructionInfo(InstructionInfo&
_info,
target_addr_t
DisassemblerX8664::GetInstructionTargetAddress(CpuState* state) const
{
- if (fUdisData->mnemonic != UD_Icall && fUdisData->mnemonic != UD_Ijmp)
+ ud_mnemonic_code mnemonic = ud_insn_mnemonic(fUdisData);
+ if (mnemonic != UD_Icall && mnemonic != UD_Ijmp)
return 0;
CpuStateX8664* x64State = dynamic_cast<CpuStateX8664*>(state);
Other related posts:
- » [haiku-commits] haiku: hrev48289 - src/apps/debugger/arch/x86_64/disasm - anevilyak
