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

[calu.git] / 3c_disasm / dasm.cpp

diff --git a/3c_disasm/dasm.cpp b/3c_disasm/dasm.cpp
index 08796f1509558df10aea8eae1c4f11b6e56c8e2a..177da6e6d7d3c40a44a704c03d1866cf212e25a0 100644 (file)
--- a/3c_disasm/dasm.cpp
+++ b/3c_disasm/dasm.cpp
@@ -69,18 +69,7 @@ int main(int argc, char* argv[])
 
        CInstrFactory instrFab;
        try {
-#ifdef DEBUG
-               cout << "Loaded " << instrFab.searchLibsInDir(dir) << " Libraryfiles" << endl;
-#else
-               instrFab.searchLibsInDir(dir);
-#endif
-               while(instrFab.getNumFiles() >= 1) {
-                       Iinstr* pinstr = instrFab.getNextInstr();
-                       instr.insert(make_pair(pinstr->getOpcode(),pinstr));
-#ifdef DEBUG
-                       cout << "found: " << instr->getName() << " its opcode is : " << instr->getOpcode() << endl;
-#endif
-               }
+               instrFab.loadLibsIntoMap(instr, dir);
        }
        catch(std::bad_alloc& e) {
                cerr << progName << ": bad_alloc caught " << e.what() << endl;
@@ -131,7 +120,7 @@ int main(int argc, char* argv[])
                                                out << "[0x" << *tok_iter << "]: ";
                                        }
                                        else if(count == 2) {
-                                               out << disasm.decode(*tok_iter);
+                                               out << disasm.decodeToString(*tok_iter);
                                        }
                                        else if(count == 3) {
                                                //code saved in hex-file