From 59c9513f19b630621d77d7919e4a2e62b2c3e08a Mon Sep 17 00:00:00 2001
From: slack <slack@codemaniacs.com>
Date: Tue, 17 Mar 2009 02:21:00 +0100
Subject: [PATCH] Disassembly view fixes

---
 qtboi/QtBoiDisassemblyWindow.cc | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/qtboi/QtBoiDisassemblyWindow.cc b/qtboi/QtBoiDisassemblyWindow.cc
index 81592e5..a3d6978 100644
--- a/qtboi/QtBoiDisassemblyWindow.cc
+++ b/qtboi/QtBoiDisassemblyWindow.cc
@@ -56,26 +56,37 @@ std::string QtBoiDisassemblyWindow::operandToHtml(const Instruction::Operand &op
 std::string QtBoiDisassemblyWindow::insToHtml(const Instruction &ins)
 {
 
-	std::string result(ins.str);
-	result += " ";
-	if (ins.str.substr(0,2)=="JR")
-	{
-		result += operandToHtml(ins.op1);
-		result += " [";
-		result += htmlLinkMem(ins.op2.val);
-		result += "]";
-	}
-	else if (ins.str.substr(0,2)=="JP" || ins.str.substr(0,4)=="CALL")
+	std::string result;
+
+	if (ins.type == Instruction::RESET)
 	{
-		result += htmlLinkMem(ins.op1.val);
+		result += "RST ";
+		result += htmlLinkMem(strtol(ins.str.substr(4).c_str(), 0, 16));
 	}
-	else 
+	else
 	{
-		result += operandToHtml(ins.op1);
-		if (ins.op2.type != Instruction::NONE)
+		result += ins.str;
+		result += " ";
+		if (ins.str.substr(0,2)=="JR")
+		{
+			result += operandToHtml(ins.op1);
+			result += " [";
+			result += htmlLinkMem(ins.op2.val);
+			result += "]";
+		}
+		else if ((ins.str.substr(0,2)=="JP" && ins.op1.type == Instruction::INM16)
+				|| ins.str.substr(0,4)=="CALL")
+		{
+			result += htmlLinkMem(ins.op1.val);
+		}
+		else
 		{
-			result += ", ";
-			result += operandToHtml(ins.op2);
+			result += operandToHtml(ins.op1);
+			if (ins.op2.type != Instruction::NONE)
+			{
+				result += ", ";
+				result += operandToHtml(ins.op2);
+			}
 		}
 	}
 	return result;
-- 
2.34.1