1 files changed, 34 insertions, 0 deletions

diff --git a/ue3/mycpu/instructions.cpp b/ue3/mycpu/instructions.cpp
index c2ce096..ef9e944 100644
--- a/ue3/mycpu/instructions.cpp
+++ b/ue3/mycpu/instructions.cpp
@@ -6,6 +6,7 @@
  */
 
 #include <map>
+#include <assert.h>
 #include "instructions.h"
 
 using namespace std;
@@ -22,6 +23,8 @@ void CInstructionInc::compile(std::list<std::string>& params)
 
 void CInstructionInc::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   cpu->getRegisters()[ m_regidx1 ]++;
 }
@@ -40,6 +43,8 @@ void CInstructionDec::compile(std::list<std::string>& params)
 
 void CInstructionDec::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   cpu->getRegisters()[ m_regidx1 ]--;
 }
@@ -62,6 +67,8 @@ void CInstructionAdd::compile(std::list<std::string>& params)
 
 void CInstructionAdd::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   checkRegister(cpu, m_regidx2);
   checkRegister(cpu, m_regidx3);
@@ -87,6 +94,8 @@ void CInstructionSub::compile(std::list<std::string>& params)
 
 void CInstructionSub::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   checkRegister(cpu, m_regidx2);
   checkRegister(cpu, m_regidx3);
@@ -137,6 +146,8 @@ void CInstructionDiv::compile(std::list<std::string>& params)
 
 void CInstructionDiv::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   checkRegister(cpu, m_regidx2);
   checkRegister(cpu, m_regidx3);
@@ -160,6 +171,9 @@ void CInstructionLoad::compile(std::list<std::string>& params)
 
 void CInstructionLoad::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
+  assert(cpu->getMemory() != NULL);
   checkRegister(cpu, m_regidx1);
   checkRegister(cpu, m_regidx2);
   CDat val(cpu->getRegisters()[ m_regidx2 ]);
@@ -182,6 +196,9 @@ void CInstructionStore::compile(std::list<std::string>& params)
 
 void CInstructionStore::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
+  assert(cpu->getMemory() != NULL);
   checkRegister(cpu, m_regidx1);
   checkRegister(cpu, m_regidx2);
   CDat val(cpu->getRegisters()[ m_regidx2 ]);
@@ -202,6 +219,8 @@ void CInstructionTest::compile(std::list<std::string>& params)
 
 void CInstructionTest::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   if (cpu->getRegisters()[ m_regidx1 ] == CDat(0))
     cpu->setFlagZero(true);
@@ -223,6 +242,9 @@ void CInstructionJumpA::compile(std::list<std::string>& params)
 
 void CInstructionJumpA::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
+  assert(cpu->getProgram() != NULL);
   if (m_addr.empty())
     throw runtime_error("Empty address");
   cpu->getRegisters()[ 0 ] = cpu->getProgram()->findLabel(m_addr);
@@ -242,8 +264,13 @@ void CInstructionJumpZ::compile(std::list<std::string>& params)
 
 void CInstructionJumpZ::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
+  assert(cpu->getProgram() != NULL);
   if (!cpu->getFlagZero())
     return;
+  if (m_addr.empty())
+    throw runtime_error("Empty address");
   cpu->getRegisters()[ 0 ] = cpu->getProgram()->findLabel(m_addr);
 }
 
@@ -261,8 +288,13 @@ void CInstructionJumpS::compile(std::list<std::string>& params)
 
 void CInstructionJumpS::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
+  assert(cpu->getProgram() != NULL);
   if (!cpu->getFlagSign())
     return;
+  if (m_addr.empty())
+    throw runtime_error("Empty address");
   cpu->getRegisters()[ 0 ] = cpu->getProgram()->findLabel(m_addr);
 }
 
@@ -282,6 +314,8 @@ void CInstructionWrite::compile(std::list<std::string>& params)
 
 void CInstructionWrite::execute(CCPU *cpu)
 {
+  assert(cpu != NULL);
+  assert(cpu->getRegisters() != NULL);
   checkRegister(cpu, m_regidx1);
   if (m_dev.empty())
     throw runtime_error("Empty device");