disasm: changed interface / fixed Makefile

diff --git a/3c_disasm/Iinstr.hpp b/3c_disasm/Iinstr.hpp
index 95b5229d94c9d997e8f508e4a0df133326ca91f0..d590dc70720c2a52dbdb5b41a52580b6414731e9 100644 (file)
--- 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 35b6ff503bbe5b0d8d8304baff5dbb184f31f682..960717edeeb115a2b921ed1432b9cb2e7d3c19fb 100644 (file)
--- 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: