progs: bench tools bei deepjit.s geadded

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

diff --git a/3c_disasm/disasm.h b/3c_disasm/disasm.h
index 908a3ee3936d00a42357f3ba6ab17079410cf10d..403e38d3c333b6b6b5e76e4dd4f70a1e0ad1c9ef 100644 (file)
--- a/3c_disasm/disasm.h
+++ b/3c_disasm/disasm.h
@@ -1,7 +1,14 @@
+#ifndef __DISASM_H__
+#define __DISASM_H__
+
 #include <iostream>
 #include <string>
 #include <map>
 
+#include "uint32_from_hex.hpp"
+
+class Iinstr;
+
 #include "Iinstr.hpp"
 
 using namespace std;
@@ -10,27 +17,15 @@ 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);
+               Iinstr* decodeNum(CDat);
+               std::string decodeToString(std::string str);
 };
 
+#endif