mirror of
https://github.com/zoriya/ComSquare.git
synced 2026-06-03 02:23:49 +00:00
merge master into PPU
This commit is contained in:
+1
-1
@@ -222,7 +222,7 @@ namespace ComSquare::CPU
|
||||
unsigned CPU::update()
|
||||
{
|
||||
unsigned cycles = 0;
|
||||
const unsigned maxCycles = 0x17;
|
||||
const unsigned maxCycles = 0x0C;
|
||||
|
||||
for (DMA &channel : this->_dmaChannels) {
|
||||
if (!channel.enabled)
|
||||
|
||||
@@ -55,11 +55,6 @@ namespace ComSquare::CPU
|
||||
std::string name = "";
|
||||
AddressingMode addressingMode = Implied;
|
||||
int size = 0;
|
||||
|
||||
Instruction() = default;
|
||||
Instruction(const Instruction &) = default;
|
||||
Instruction &operator=(const Instruction &) = default;
|
||||
~Instruction() = default;
|
||||
};
|
||||
}
|
||||
#endif //COMSQUARE_INSTRUCTION_HPP
|
||||
|
||||
Reference in New Issue
Block a user