From 8add07a8e1f76b3ebb178e9b0d6d20165b341c98 Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Sat, 27 Jul 2013 22:58:13 -0400
Subject: [PATCH] Debugger: Fix some handling in DisassemblerX8664.

Take into account the operand and offset size as needed, otherwise
we'd potentially use the wrong value for our calculations.

Gets return values somewhat working on x86-64, though in some cases
looking up a PLT slot's destination fails, for as yet undetermined
reasons.
---
 .../arch/x86_64/disasm/DisassemblerX8664.cpp  | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp b/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
index 70bbf04192..785425bb20 100644
--- a/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
+++ b/src/apps/debugger/arch/x86_64/disasm/DisassemblerX8664.cpp
@@ -209,19 +209,41 @@ DisassemblerX8664::GetInstructionTargetAddress(CpuState* state) const
 			targetAddress += x64State->IntRegisterValue(
 				RegisterNumberFromUdisIndex(fUdisData->operand[0].index))
 				* fUdisData->operand[0].scale;
+			off_t offset = 0;
+			switch (fUdisData->operand[0].offset) {
+				case 8:
+					offset = fUdisData->operand[0].lval.sbyte;
+					break;
+				case 16:
+					offset = fUdisData->operand[0].lval.sword;
+					break;
+				case 32:
+					offset = fUdisData->operand[0].lval.sdword;
+					break;
+				case 64:
+					offset = fUdisData->operand[0].lval.sqword;
+					break;
+			}
+			targetAddress += offset;
 		}
 		break;
 		case UD_OP_JIMM:
 		{
-			targetAddress = ud_insn_off(fUdisData)
-				+ fUdisData->operand[0].lval.sdword + ud_insn_len(fUdisData);
+			targetAddress = ud_insn_off(fUdisData) + ud_insn_len(fUdisData);
+			if (fUdisData->operand[0].size == 32)
+				targetAddress += fUdisData->operand[0].lval.sdword;
+			else
+				targetAddress += fUdisData->operand[0].lval.sqword;
 		}
 		break;
 
 		case UD_OP_IMM:
 		case UD_OP_CONST:
 		{
-			targetAddress = fUdisData->operand[0].lval.udword;
+			if (fUdisData->operand[0].size == 32)
+				targetAddress = fUdisData->operand[0].lval.udword;
+			else if (fUdisData->operand[0].size == 64)
+				targetAddress = fUdisData->operand[0].lval.uqword;
 		}
 		break;