mirror of
https://github.com/zoriya/ComSquare.git
synced 2026-06-05 10:59:38 +00:00
Merge branch 'Debugger' of github.com:AnonymusRaccoon/ComSquare into CPU
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include <utility>
|
||||
#include <iostream>
|
||||
#include "../Exceptions/InvalidAddress.hpp"
|
||||
#include "../Exceptions/InvalidOpcode.hpp"
|
||||
|
||||
namespace ComSquare::CPU
|
||||
{
|
||||
|
||||
+2
-1
@@ -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);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user