From e9058c9f44ef4aa3aed9503414baac94ba17c54e Mon Sep 17 00:00:00 2001
From: Martin Perner <martin@perner.cc>
Date: Fri, 29 Oct 2010 18:48:57 +0200
Subject: [PATCH] disasm: changed interface / fixed Makefile

---
 3c_disasm/Iinstr.hpp | 8 ++++----
 3c_disasm/Makefile   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/3c_disasm/Iinstr.hpp b/3c_disasm/Iinstr.hpp
index 95b5229..d590dc7 100644
--- a/3c_disasm/Iinstr.hpp
+++ b/3c_disasm/Iinstr.hpp
@@ -50,7 +50,7 @@ class Iinstr {
 		boost::dynamic_bitset<> argbits;
 		Iinstr() : opcode(0), name(""), m_ra(0), m_rb(0), m_rd(0), m_c(0), m_d(0), m_hl(0), m_f(0), m_s(0), m_imm(0), m_cond(ALWAYS), argbits(32) {}
 
-		int generate16ImmFill(const int value) { 
+		int generate16ImmFill(const int value) const {
 			int i = value;
 			if(m_hl == true && m_f == true) {
 				i <<= 16;
@@ -70,7 +70,7 @@ class Iinstr {
 			return i; 
 		}
 
-		int generate16ImmSign(const int value) { 
+		int generate16ImmSign(const int value) const {
 			int i = value;
 			if(m_hl == true) {
 				i <<= 16;
@@ -82,7 +82,7 @@ class Iinstr {
 			return i; 
 		}
 
-		int generate12ImmSign(const int value) { 
+		int generate12ImmSign(const int value) const {
 			int i = value;
 			if(m_s == true && (i & 0x0800) != 0) {
 					i |= 0xFFFFF000;
@@ -91,7 +91,7 @@ class Iinstr {
 			return i; 
 		}
 
-		int generate15ImmSign(const int value) { 
+		int generate15ImmSign(const int value) const {
 			int i = value;
 			if(m_s == true && (i & 0x4000) != 0) {
 					i |= 0xFFFF8000;
diff --git a/3c_disasm/Makefile b/3c_disasm/Makefile
index 35b6ff5..960717e 100644
--- a/3c_disasm/Makefile
+++ b/3c_disasm/Makefile
@@ -15,8 +15,8 @@ $(PROG): $(sources:.cpp=.o)
 libs:   
 	$(MAKE) -C instr all
 
-$(sources):
-	$(CC) $(CPPFLAGS) -c  -o ${@:.cpp=.o} ${@}
+$(sources:.cpp=.o):
+	$(CC) $(CPPFLAGS) -c  -o ${@} ${@:.o=.cpp}
 
 .PHONY:clean
 clean:  
-- 
2.25.1