1 files changed, 119 insertions, 67 deletions

diff --git a/ue3/mycpu/cprogram.cpp b/ue3/mycpu/cprogram.cpp
index 9297b6e..3fcf734 100644
--- a/ue3/mycpu/cprogram.cpp
+++ b/ue3/mycpu/cprogram.cpp
@@ -1,109 +1,161 @@
 /**
  * @module cprogram
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  class for parsing and saving a program
- * @date   11.05.2009
+ * @brief  CProgram extends std::vector and adds a method for parsing programfile
+ * @date   12.05.2009
  */
 
-#include <fstream>
-#include <vector>
-#include <string>
-#include <boost/tokenizer.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
+#ifdef DEBUG
+# include <iostream>
+# include <iomanip>
+#endif
 #include "cprogram.h"
-
-
+#include "instructions.h"
 
 using namespace std;
-using namespace boost;
 
-CProgram::CProgram(const std::string& progfile) :
-        m_programfile(progfile)
+CProgram::CProgram()
 {
-        parse();
-        dump(std::cout);   
- 
+  m_instrset.insert(new CInstructionInc);
+  m_instrset.insert(new CInstructionDec);
+  m_instrset.insert(new CInstructionAdd);
+  m_instrset.insert(new CInstructionSub);
+  m_instrset.insert(new CInstructionMul);
+  m_instrset.insert(new CInstructionDiv);
+  m_instrset.insert(new CInstructionLoad);
+  m_instrset.insert(new CInstructionStore);
+  m_instrset.insert(new CInstructionTest);
+  m_instrset.insert(new CInstructionLabel);
+  m_instrset.insert(new CInstructionJumpA);
+  m_instrset.insert(new CInstructionJumpZ);
+  m_instrset.insert(new CInstructionJumpS);
+  m_instrset.insert(new CInstructionWrite);
 }
 
 /*----------------------------------------------------------------------------*/
 
 CProgram::~CProgram()
 {
-
+  /* free instruction set */
+  set<CInstruction *>::iterator it;
+  for (it = m_instrset.begin(); it != m_instrset.end(); ++it)
+    delete *it;
+
+  /* free instruction */
+  for (iterator it = begin(); it != end(); ++it)
+    delete *it;
 }
 
-
-
 /*----------------------------------------------------------------------------*/
 
-void CProgram::parse()
+void CProgram::compile(std::istream& in)
 {
-         /* open and read file */
-  ifstream file(m_programfile.c_str(), ios::in);
- // if (!file)
-   // throw ParserError("Unable to open scriptfile '" + m_scriptfile + "'.");
-        
-        int cur_line_nr = 0;
-        
-  while (!file.eof() && file.good())
+  if (!in.good())
+    return;
+
+  string line;
+  unsigned i = 0;
+  while (!in.eof() && in.good())
   {
-        string cur_line;
-        
-    /* read file per line */
-    getline(file, cur_line);
-    if (cur_line.empty())
+    ++i;
+
+    /* read stream per line */
+    getline(in, line);
+    if (line.empty())
       continue;
 
-    trim(cur_line);
+    boost::trim(line);
+    boost::to_lower(line);
 
     /* ignore comments */
-    if (cur_line.find_first_of('#') == 0)
+    if (line.find_first_of('#') == 0)
       continue;
 
-                /*remove commas from current line */
-                unsigned int pos;
-                while (( pos = cur_line.find_first_of(",") ) != string::npos)
-                         cur_line.erase(pos, 1);
-                
-                /* add source line*/
-                m_progsource.push_back(vector<string>());
-        algorithm::split( m_progsource.back(), cur_line, is_any_of(" \t"));
-        
-        /* jump addr as line number */
-        if(m_progsource[cur_line_nr][0] == "label")
-        {
-                int size = m_progsource[cur_line_nr][01].size() - 1;
-                string label(m_progsource[cur_line_nr][01].substr(0, size));
-                m_jumpaddr[label] = cur_line_nr;
-        }
-        
-                cur_line_nr++;
+    /* get instruction name */
+    size_t pos = line.find_first_of(' ');
+    string instrname(line.substr(0, pos));
+
+    /* search and create instruction */
+    CInstruction *instrptr = NULL;
+    set<CInstruction *>::iterator it;
+    for (it = m_instrset.begin(); it != m_instrset.end(); ++it)
+    {
+      if (*(*it) == instrname)
+      {
+        instrptr = *it;
+        break;
+      }
+    }
+    if (instrptr == NULL)
+    {
+      stringstream sstr;
+      sstr << "Unknown instruction '" << instrname << "' on line " << i << ".";
+      throw runtime_error(sstr.str());
+    }
+
+    /* create instruction */
+    CInstruction *instr = instrptr->factory();
+
+    /* parse instruction parameters */
+    string params = (pos == string::npos) ? "" : line.substr(pos + 1);
+    boost::trim(params);
+    list<string> instrparams;
+    boost::split(instrparams, params, boost::is_any_of(", \t"), boost::token_compress_on);
+
+    /* let instruction parse the parameters. catch+throw exception */
+    try
+    {
+      /* handle label instruction ourself, but still add a dummy instruction */
+      if (instrname == "label")
+      {
+        if (instrparams.size() != 1)
+          throw runtime_error("Invalid paramater count - must be 1");
+        string label(instrparams.front());
+        if (label.length() < 2 || label[ label.length() - 1] != ':')
+          throw runtime_error("Label has invalid syntax");
+        m_labels[ label.substr(0, label.length() - 1) ] = size();
+      }
+      instr->compile(instrparams);
+    }
+    catch(runtime_error& ex)
+    {
+      stringstream sstr;
+      sstr << "Unable to compile instruction '" << instrname
+           << "' (line " << i << "): " << ex.what();
+      throw runtime_error(sstr.str());
+    }
+
+    push_back(instr);
   }
-  file.close();
+}
+
+/*----------------------------------------------------------------------------*/
 
+unsigned CProgram::findLabel(const std::string& label) const
+{
+  map<string, unsigned>::const_iterator it;
+  it = m_labels.find(label);
+  if (it == m_labels.end())
+    throw runtime_error("Unknown label '" + label + "'");
+  return it->second;
 }
 
 /*----------------------------------------------------------------------------*/
 
-#ifdef DEBUG
+#if DEBUG
 void CProgram::dump(std::ostream& out)
 {
-        
-        out << endl << "Program file:" << endl << m_programfile << endl;
-        
-        out << endl     << "Program source:" << endl;
-        for (int i = 0; i < (int) m_progsource.size();i++)
+  out << "[PROGRAM DUMP]" << endl;
+  unsigned i = 0;
+  for(iterator it = begin(); it < end(); ++it)
   {
-                for(int x = 0; x < (int) m_progsource[i].size();x++)
-                out << m_progsource[i][x] << " ";
-        out << std::endl;
+    out << "[" << std::setw(4) << std::setfill('0') << i << "]  "
+        << *(*it) << endl;
+    ++i;
   }
-  
-  out << endl   << "Jump addresses:" << endl;
-  map<string, unsigned int>::iterator it;
-        for (it = m_jumpaddr.begin(); it != m_jumpaddr.end(); it++)
-                out << (*it).first << "  " <<  (*it).second << endl;
-  
 }
 #endif
+
+/* vim: set et sw=2 ts=2: */