disasm/sim: changed interface, branch => br, features++

[calu.git] / 3c_disasm / disasm.h

diff --git a/3c_disasm/disasm.h b/3c_disasm/disasm.h
index 908a3ee3936d00a42357f3ba6ab17079410cf10d..078bd17ba3806f0d3f5c45d97a26b271fcd0efb8 100644 (file)
--- a/3c_disasm/disasm.h
+++ b/3c_disasm/disasm.h
@@ -2,6 +2,7 @@
 #include <string>
 #include <map>
 
+#include "uint32_from_hex.hpp"
 #include "Iinstr.hpp"
 
 using namespace std;
@@ -10,27 +11,13 @@ class disasm {
 
        private:
                std::map<short,Iinstr*> instrs;
-       class uint32_from_hex   // For use with boost::lexical_cast
-       {
-               typedef unsigned int uint32;
-               uint32 value;
-               public:
-                       operator uint32() const {
-                               return value;
-                       }
-                       friend std::istream& operator>>(std::istream& in, uint32_from_hex& outValue)
-                       {
-                               in >> std::hex >> outValue.value;
-                               return in;
-                       }
-       };
-
        protected:
                void decodeCondition(short);
                Iinstr* decodeOpcode(short);
 
        public:
                disasm(std::map<short,Iinstr*> map) : instrs(map) {};
-               std::string decode(std::string);
+               Iinstr* decode(std::string);
+               std::string decodeToString(std::string str);
 };