From 80cc627dcc164b3c36ebb3682f9e38c9faddf187 Mon Sep 17 00:00:00 2001
From: slack <slack@codemaniacs.com>
Date: Sat, 16 Aug 2008 15:11:33 +0200
Subject: [PATCH] disassembler things. more to come soon

---
 Makefile            | 2 +-
 wendi/Instruction.h | 6 ++++++
 wendi/wendi.cc      | 6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index acc44d2..631e92c 100644
--- a/Makefile
+++ b/Makefile
@@ -47,6 +47,6 @@ wendi/wendi: wendi/wendi.cc wendi/CodeBlock.o wendi/disasm.o gbcore.o MBC.o \
 	g++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 
 clean:
-	rm -f *.o tests/test_gbrom tests/test_core
+	rm -f *.o wendi/*.o wendi/wendi tests/test_gbrom tests/test_core
 
 .PHONY: clean tests all
diff --git a/wendi/Instruction.h b/wendi/Instruction.h
index ce463d7..41aa0aa 100644
--- a/wendi/Instruction.h
+++ b/wendi/Instruction.h
@@ -17,6 +17,12 @@ struct Instruction
 		OTHER
 	};
 
+	enum InstructionSubType
+	{
+		JP,
+		JR,
+	}
+
 	enum Register { A=0,B,C,D,E,H,L,AF,BC,DE,HL,SP,PC };
 
 	enum OperandType
diff --git a/wendi/wendi.cc b/wendi/wendi.cc
index f734df2..e7ea524 100644
--- a/wendi/wendi.cc
+++ b/wendi/wendi.cc
@@ -89,7 +89,8 @@ void show_block(const CodeBlock& b)
 bool is_block_end(const Instruction &ins)
 {
 	if (ins.type == Instruction::UNCONDITIONAL_JUMP || 
-			ins.type == Instruction::RET)
+			ins.type == Instruction::RET ||
+			ins.type == Instruction::RESET)
 		return true;
 
 	return false;
@@ -113,7 +114,8 @@ address jump_address(const Instruction &ins)
 	{
 		if (ins.str.substr(0,2)=="JR")
 			return ins.op2.val;
-		else return ins.op1.val;
+		else if (ins.op1.type == Instruction::INM16)
+			return ins.op1.val;
 	}
 	else // RESET
 	{
-- 
2.34.1