threads, moved to include, Mailbox

brynmathias · Apr 15, 2009 · 6a0f450 · 6a0f450
1 parent d5bdd07
commit 6a0f450
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 372 deletions.
diff --git a/Controller/ARM/InstructionARM.cc b/Controller/ARM/InstructionARM.cc
@@ -4,7 +4,7 @@
 
 //this is the ARM disassembler
 
-#include "InstructionARM.h"
+#include "InstructionARM.h"     //just included here
 #include "templateARM.h"        //just included here
 
 using namespace eda;

diff --git a/Controller/ARM/InstructionARM.h b/Controller/ARM/InstructionARM.h
@@ -2,11 +2,13 @@
 //    by geohot
 //  released under GPLv3, see http://gplv3.fsf.org/
 
+//not moved into include on purpose
+
 #ifndef EDA_INSTRUCTIONARM_H_
 #define EDA_INSTRUCTIONARM_H_
 
-#include "../Instruction.h"
-#include "../../include/macros.h"
+#include "Instruction.h"
+#include "macros.h"
 
 #include "InstructionARM.h"
 

diff --git a/Controller/ARM/templateARM.h b/Controller/ARM/templateARM.h
@@ -2,11 +2,13 @@
 //    by geohot
 //  released under GPLv3, see http://gplv3.fsf.org/
 
+//not moved into include on purpose
+
 #ifndef EDA_TEMPLATEARM_H_
 #define EDA_TEMPLATEARM_H_
 
 #include <string>
-#include "../../Model/ParsedInstruction.h"
+#include "ParsedInstruction.h"
 
 typedef union
 {

diff --git a/Controller/Changelist.h b/Controller/Changelist.h
diff --git a/Controller/Instruction.h b/Controller/Instruction.h
diff --git a/Controller/StatelessChangelist.cc b/Controller/StatelessChangelist.cc
@@ -2,8 +2,8 @@
 //    by geohot
 //  released under GPLv3, see http://gplv3.fsf.org/
 
-#include "../Model/RegisterFile.h"
-#include "../Model/Memory.h"
+#include "RegisterFile.h"
+#include "Memory.h"
 
 #include "StatelessChangelist.h"
 

diff --git a/Controller/StatelessChangelist.h b/Controller/StatelessChangelist.h
diff --git a/Core.cc b/Core.cc
@@ -1,7 +1,15 @@
+#include "ConsoleFrontEnd.h"
+
 #include <iostream>
 #include "Core.h"
+#include "macros.h"
 using namespace std;
 
+int ParsedInstruction_test();
+int File_test();
+int InstructionARM_test();
+int Memory_test();
+
 namespace eda {
 
 Core::Core(Edb* edb, Server* server): mEdb(edb), mServer(server) {
@@ -15,11 +23,19 @@ void Core::update() {
 
 void Core::test() {
   // From testSuite.cc
-  cout << "running tests.          " << endl;
-  cout << "ParsedInstruction test: "; //ParsedInstruction_test();
-  cout << "File test:              "; //File_test();
-  cout << "debug macro test:       "; //debug << "test" << endl;
-  cout << "InstructionARM test:    "; //InstructionARM_test();
+  /*cout << "running tests.          " << endl;
+  cout << "ParsedInstruction test: "; ParsedInstruction_test();
+  cout << "File test:              "; File_test();
+  cout << "debug macro test:       "; info << "test" << endl;
+  cout << "InstructionARM test:    "; InstructionARM_test();
+  cout << "Memory test:            "; Memory_test();*/
+  Mailbox test;
+  ConsoleFrontEnd a(&test,0);
+  while(1)
+  {
+    Mail yay=test.waitForMail();
+    cout << "i've got mail: " << yay.mCommand << endl;
+  }
   return;// 0;
 }
 

diff --git a/Model/File.h b/Model/File.h
diff --git a/Model/Memory.cc b/Model/Memory.cc
@@ -2,7 +2,7 @@
 //    by geohot
 //  released under GPLv3, see http://gplv3.fsf.org/
 
-#include "../include/macros.h"
+#include "macros.h"
 #include "Memory.h"
 #include <iostream>
 #include <iomanip>

diff --git a/Model/Memory.h b/Model/Memory.h
diff --git a/Model/ParsedInstruction.h b/Model/ParsedInstruction.h