Merge branch 'Debugger' of github.com:AnonymusRaccoon/ComSquare into CPU

This commit is contained in:
Anonymus Raccoon
2020-05-14 17:58:00 +02:00
9 changed files with 39 additions and 15 deletions
-1
View File
@@ -7,7 +7,6 @@
#include <utility>
#include <iostream>
#include "../Exceptions/InvalidAddress.hpp"
#include "../Exceptions/InvalidOpcode.hpp"
namespace ComSquare::CPU
{
+2 -1
View File
@@ -732,6 +732,7 @@ namespace ComSquare::CPU
CPU(const CPU &) = default;
CPU &operator=(const CPU &) = delete;
~CPU() override = default;
//! @brief This function continue to execute the Cartridge code.
//! @return The number of CPU cycles that elapsed
virtual unsigned update();
@@ -766,7 +767,7 @@ namespace ComSquare::CPU
virtual bool isDebugger();
//! @brief Change the memory bus used by the CPU.
void setMemoryBus(std::shared_ptr<Memory::MemoryBus> bus);
virtual void setMemoryBus(std::shared_ptr<Memory::MemoryBus> bus);
};
}