merge master into PPU

This commit is contained in:
Clément Le Bihan
2021-02-17 14:37:39 +01:00
27 changed files with 1500 additions and 490 deletions
+1 -1
View File
@@ -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)
-5
View File
@@ -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