phases

Author: Pyrix25633

include/math.hpp

@@ -7,6 +7,12 @@ struct StatusRegister;
 
 using namespace std;
 
+typedef int8_t Int8;
+typedef int16_t Int16;
+typedef int32_t Int32;
+ostream& operator << (ostream& os, Uint8 n);
+ostream& operator << (ostream& os, Int8 n);
+
 struct Vector2f;
 struct Vector2d;
 struct HitBox2d;

include/utils.hpp

@@ -20,10 +20,6 @@
 using namespace std;
 using namespace Json;
 
-typedef int8_t Int8;
-typedef int16_t Int16;
-typedef int32_t Int32;
-
 struct ControlBus;
 struct Instruction;
 struct StatusRegister;
@@ -378,6 +374,9 @@ class CentralProcessingUnit{
  * @brief Function to fetch the operand
  */
  void fetchOperand();
+ /**
+ * @brief Function to execute the instruction 
+ */
  void executeInstruction();
  /**
  * @brief Function to get the Program Counter value
@@ -414,6 +413,18 @@ class CentralProcessingUnit{
  * @return The instriction name, type string
  */
  string getInstName();
+ /**
+ * @brief Function to get a register from the ALU that is private
+ * @param r The registrer number
+ * @returns The value, type Uint16
+ */
+ Uint16 getR(Uint8 r);
+ /**
+ * @brief Function to get the two phases
+ * @param now Variable in which store phase now
+ * @param next Variable in which store phase next
+ */
+ void getPhases(Uint8 &now, Uint8 &next);
  private:
  Uint16 PC; //Program Counter
  Uint16 SP; //Stack Pointer

src/main.cpp

@@ -11,10 +11,6 @@
 
 using namespace std;
 
-void randFunc(int a) {
- cout << "Here is a button action! " << a << endl;
-}
-
 int main(int argc, char* args[]) {
  //Variables
  Logger logger;
@@ -31,17 +27,15 @@ int main(int argc, char* args[]) {
  Uint8 cursorState = 0; //0 -> normal, 1 -> hover, 2 -> normal clicked, 3 -> hover clicked
  Cursor cursor = JsonManager::getCursor();
  vector<HitBox2d> hitboxes = {HitBox2d(0, 0, 10, 10), HitBox2d(0, 100, 16, 16)}; //Vector of all hitboxes
- Uint8 inHitboxes = 0;
- bool clicked = false;
+ Uint8 inHitboxes = 0, phaseNow, phaseNext;
+ bool clicked = false, refresh = true, constantRefresh = false;
 
  //Interpreter
  SystemBus SB;
  CentralMemory CM(&SB, settings.interpreter.ramSize);
  InputOutputDevices IOD(&SB);
  CentralProcessingUnit CPU(&SB, &CM, &IOD, settings.interpreter.start);
  CM.loadProgram(settings.interpreter.file, settings.interpreter.binary, &logger);
- CPU.fetchInstruction();
- CPU.decodeInstruction();
 
  //Capturing cout in log file
  if(settings.console.log) freopen("log.txt", "w", stdout);
@@ -205,27 +199,52 @@ int main(int argc, char* args[]) {
  if(cursorState >= 2) fastButton.changePressed();
  else fastButton.changeNormal();
  inHitboxes++;
+ if(clicked) constantRefresh = true;
  }
  if(guiCursorPosition == *playButton.getHitBox()) {
  if(cursorState >= 2) playButton.changePressed();
  else playButton.changeNormal();
  inHitboxes++;
- if(clicked) playButton.action(randFunc);
+ if(clicked) refresh = true;
  }
  if(guiCursorPosition == *nextButton.getHitBox()) {
  if(cursorState >= 2) nextButton.changePressed();
  else nextButton.changeNormal();
  inHitboxes++;
+ if(clicked) {
+ refresh = true;
+ switch(phaseNext) {
+ case 0:
+ CPU.fetchInstruction();
+ break;
+ case 1:
+ CPU.decodeInstruction();
+ break;
+ case 2:
+ CPU.fetchOperand();
+ break;
+ case 3:
+ CPU.executeInstruction();
+ }
+ }
  }
  if(guiCursorPosition == *pauseButton.getHitBox()) {
  if(cursorState >= 2) pauseButton.changePressed();
  else pauseButton.changeNormal();
  inHitboxes++;
+ if(clicked) {
+ constantRefresh = false;
+ refresh = true;
+ }
  }
  if(guiCursorPosition == *stopButton.getHitBox()) {
  if(cursorState >= 2) stopButton.changePressed();
  else stopButton.changeNormal();
  inHitboxes++;
+ if(clicked) {
+ constantRefresh = false;
+ refresh = true;
+ }
  }
  if(inHitboxes > 0) {
  if(cursorState == 0) cursorState = 1;
@@ -243,13 +262,22 @@ int main(int argc, char* args[]) {
  }
 
  instNameValue = CPU.getInstName();
- //CPU Values
- pcValue = "0x" + math::Uint16Tohexstr(CPU.getPC());
- irValue = "0x" + math::Uint16Tohexstr(CPU.getIR());
- srValue = math::StatusRegisterToHexstr(CPU.getSR());
- arValue = "0x" + math::Uint16Tohexstr(CPU.getAR());
- drValue = "0x" + math::Uint16Tohexstr(CPU.getDR());
- spValue = "0x" + math::Uint16Tohexstr(CPU.getSP());
+ if(refresh || constantRefresh) {
+ //CPU Values
+ pcValue = "0x" + math::Uint16Tohexstr(CPU.getPC());
+ irValue = "0x" + math::Uint16Tohexstr(CPU.getIR());
+ srValue = math::StatusRegisterToHexstr(CPU.getSR());
+ arValue = "0x" + math::Uint16Tohexstr(CPU.getAR());
+ drValue = "0x" + math::Uint16Tohexstr(CPU.getDR());
+ spValue = "0x" + math::Uint16Tohexstr(CPU.getSP());
+ refresh = false;
+ for(Uint8 i = 0; i < 16; i++) {
+ registriesValues[i] = "0x" + math::Uint16Tohexstr(CPU.getR(i));
+ }
+ CPU.getPhases(phaseNow, phaseNext);
+ progressBarNowEntity.setX(178 + 8 * phaseNow);
+ progressBarNextEntity.setX(178 + 8 * phaseNext);
+ }
  //GUI backgrounds
  Window.renderGui(cpuGui);
  //CPU Render
@@ -283,8 +311,12 @@ int main(int argc, char* args[]) {
  Window.renderText(progressBarOfTitle);
  Window.renderText(progressBarIeTitle);
  Window.renderGui(progressBarEntity);
- Window.renderGui(progressBarNowEntity);
- Window.renderGui(progressBarNextEntity);
+ if(phaseNow < 4) {
+ Window.renderGui(progressBarNowEntity);
+ }
+ if(phaseNext < 4) {
+ Window.renderGui(progressBarNextEntity);
+ }
  //Buttons
  Window.renderButton(fastButton);
  Window.renderButton(playButton);

src/math.cpp

@@ -2,6 +2,16 @@
 
 using namespace std;
 
+ostream& operator << (ostream& os, Uint8 n) {
+ os << Uint16(n);
+ return os;
+}
+
+ostream& operator << (ostream& os, Int8 n) {
+ os << Int16(n);
+ return os;
+}
+
 Vector2f::Vector2f() :x(0.0), y(0.0) {}
 
 Vector2f::Vector2f(float px, float py) :x(px), y(py) {}

src/utils.cpp

@@ -279,7 +279,7 @@ void SystemBus::resetBus() {
 }
 
 ArithmeticLogicUnit::ArithmeticLogicUnit(StatusRegister* pSR) :SR(pSR) {
- for(Uint8 i = 0; i < 0xF; i++) {
+ for(Uint8 i = 0; i <= 0xF; i++) {
  R[i] = 0x0000;
  }
 }
@@ -396,7 +396,7 @@ Uint16 ArithmeticLogicUnit::get(Uint8 r) {
 }
 
 CentralProcessingUnit::CentralProcessingUnit(SystemBus* pSB, CentralMemory* pCM, InputOutputDevices* pIOD, Uint16 start)
- :ALU(ArithmeticLogicUnit(&SR)), SB(pSB), CM(pCM), IOD(pIOD), PC(start) {}
+ :ALU(ArithmeticLogicUnit(&SR)), SB(pSB), CM(pCM), IOD(pIOD), PC(start), phaseNow(0xFF), phaseNext(0x0), instName("-----") {}
 
 void CentralProcessingUnit::fetchInstruction() {
  AR = PC;
@@ -640,6 +640,16 @@ string CentralProcessingUnit::getInstName() {
  return instName;
 }
 
+Uint16 CentralProcessingUnit::getR(Uint8 r) {
+ return ALU.get(r);
+}
+
+void CentralProcessingUnit::getPhases(Uint8 &now, Uint8 &next) {
+ now = phaseNow;
+ next = phaseNext;
+ return;
+}
+
 string CentralProcessingUnit::decodeInstName() {
  switch(I.group) {
  case 0x0: //Data transfer group
@@ -849,16 +859,16 @@ void CentralMemory::loadProgram(string path, bool bin, Logger* logger) {
  return; 
  }
  if(bin) {
- char s[9];
+ char s[100];
  for(Uint16 i = 0; i < size && !file.eof(); i++) {
- file.getline(s, 9);
+ file.getline(s, 100);
  M[i] = math::binstrToUint8(s);
  }
  }
  else {
- char s[3];
+ char s[100];
  for(Uint16 i = 0; i < size && !file.eof(); i++) {
- file.getline(s, 3);
+ file.getline(s, 100);
  M[i] = math::hexstrToUint8(s);
  }
  }