1 files changed, 69 insertions, 56 deletions

diff --git a/ue3/mycpu/ccpu.cpp b/ue3/mycpu/ccpu.cpp
index 978f1f7..af86200 100644
--- a/ue3/mycpu/ccpu.cpp
+++ b/ue3/mycpu/ccpu.cpp
@@ -1,76 +1,89 @@
 /**
  * @module ccpu
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  class for processing a program
- * @date   11.05.2009
+ * @brief  CPU implementation. Used as a container for memory and instructions.
+ *         Implements an run method to execute the program (= the instructions).
+ * @date   10.05.2009
  */
 
-#include <fstream>
-#include <boost/tokenizer.hpp>
-#include <boost/algorithm/string.hpp>
-
+#ifdef DEBUG
+# include <iostream>
+# include <iomanip>
+#endif
 #include "ccpu.h"
-#include "cinstruction.h"
-#include "cprogram.h"
-#include "cmem.h"
-
+#include "displays.h"
 
 using namespace std;
-using namespace boost;
 
-CCPU::CCPU(const std::string& progfile, const std::string& memfile)
-      : m_program(progfile), m_memory(memfile)
+CCPU::CCPU(const unsigned cnt)
+  : m_regcnt(cnt), m_memory(NULL), m_program(NULL), m_flagzero(false), m_flagsign(false)
 {
-        f_zero = false;
-        f_sign = false;
-        m_instrHandler["inc"] = new CInc();
-        m_instrHandler["dec"] = new CDec();
-        m_instrHandler["add"] = new CAdd();
-        m_instrHandler["sub"] = new CSub();
-        m_instrHandler["mul"] = new CMul();
-        m_instrHandler["div"] = new CDiv();
-        m_instrHandler["load"] = new CLoad();
-        m_instrHandler["store"] = new CStore();
-        m_instrHandler["test"] = new CTest(f_zero, f_sign);
-        m_instrHandler["label"] = new CLabel();
-        m_instrHandler["jumpa"] = new CJumpa(m_program.getJumpAddrs());
-        m_instrHandler["jumpz"] = new CJumpz(f_zero, f_sign, m_program.getJumpAddrs());
-        m_instrHandler["jumps"] = new CJumps(f_zero, f_sign, m_program.getJumpAddrs());
-        m_instrHandler["write"] = new CWrite();
+  /* create registers */
+  m_registers = new CDat[cnt];
+  for(unsigned i = 0; i < cnt; ++i)
+    m_registers[i] = 0;
+
+  /* create displays */
+  m_displays.insert(new CDisplayWDEZ);
+  m_displays.insert(new CDisplayWHEX);
 }
 
+/*----------------------------------------------------------------------------*/
+
 CCPU::~CCPU()
 {
-        std::map<std::string, CInstruction *>::iterator it;
-        for (it = m_instrHandler.begin(); it != m_instrHandler.end(); it++)
-                delete (*it).second ;
+  /* delete registers */
+  delete[] m_registers;
+  m_registers = NULL;
+
+  /* delete displays */
+  std::set<CDisplay *>::iterator it;
+  for (it = m_displays.begin() ; it != m_displays.end(); ++it)
+    delete *it;
 }
-void CCPU::proceed()
+
+/*----------------------------------------------------------------------------*/
+
+void CCPU::run()
 {
-        
-        while (m_memory.getRegister("R0") < m_program.getMaxProgramCount())
-        {
-                 std::vector<std::string>& i_list = m_program.getInstruction(
-                                                                                                                                                                                                                                                                                        m_memory.getRegister("R0")
-                                                                                                                                                                                                                                                                                        );
-                
-        
-                                                                                                                
-        m_instrHandler[i_list[0]]->exec(m_memory, i_list);
-/*      for(int i = 0; i < (int)i_list.size(); i++)
-                cout << i_list[i] << " ";
-        if (i_list[0] == "load")
-        {
-                
-                cout << m_memory.getRegister(i_list[1])<<" "<<m_memory.getRegister("R255")<<endl;
-                break;
-                }*/
-                m_memory.getRegister("R0")++;           
-//              cout << m_memory.getRegister("R0")<<endl;
-        //      cout<<endl;     
-        }
-        
+  if (m_memory == NULL)
+    throw runtime_error("CPU has no memory");
+  if (m_program == NULL)
+    throw runtime_error("CPU has no program to execute");
+  if (m_regcnt == 0)
+    throw runtime_error("CPU has no registers");
+
+  bool run = true;
+  while(run)
+  {
+    unsigned pc = static_cast<unsigned>(m_registers[0]);
+
+    /* end of the program reached */
+    if (pc == m_program->size())
+      break;
+
+    /* pc is out of bound */
+    if (pc > m_program->size())
+      throw runtime_error("Programcounter is out of bound");
+
+    /* execute instruction */
+    (*m_program->at(pc))(this);
+    ++m_registers[0];
+  }
 }
 
+/*----------------------------------------------------------------------------*/
 
+#if DEBUG
+void CCPU::dumpRegisters(std::ostream& out)
+{
+  out << "[REGISTER DUMP]" << endl;
+  for(unsigned i = 0; i < getRegisterCount(); ++i)
+  {
+    out << "[" << std::setw(4) << std::setfill('0') << i << "]  "
+        << m_registers[i] << endl;
+  }
+}
+#endif
 
+/* vim: set et sw=2 ts=2: */