lauchmelder/NESemu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed build for linux

Browse source
This commit is contained in:
Lauchmelder 2022-02-28 17:52:23 +01:00
parent 7ffef5851d
commit 53a7baf91f
No known key found for this signature in database
GPG key ID: C2403C69D78F011D
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CPU.cpp
View file

@ -6,8 +6,8 @@
#include "Log.hpp"
#define BIND(x) (std::bind(&CPU::x, this))
#define NEW_INSTRUCTION(op, addr, size, cyc) { BIND(op), BIND(addr), Addressing::addr, size, cyc, " " #op }
#define NEW_ILLGL_INSTR(op, addr, size, cyc) { BIND(op), BIND(addr), Addressing::addr, size, cyc, "*" #op }
#define NEW_INSTRUCTION(op, addr, size, cyc) Instruction{ BIND(op), BIND(addr), Addressing::addr, size, cyc, " " #op }
#define NEW_ILLGL_INSTR(op, addr, size, cyc) Instruction{ BIND(op), BIND(addr), Addressing::addr, size, cyc, "*" #op }
#define CHECK_NEGATIVE(x) status.Flag.Negative = (((x) & 0x80) == 0x80)
#define CHECK_ZERO(x) status.Flag.Zero = ((x) == 0x00)
@ -64,7 +64,7 @@ uint8_t CPU::Tick()
pastInstructions.pop_front();
// If the instruction is not set in the lookup table, abort
if (currentInstruction->Operation == nullptr || currentInstruction->Mode == nullptr)
if (currentInstruction->Opcode == nullptr || currentInstruction->Mode == nullptr)
{
LOG_DEBUG_ERROR("Unknown instruction {0:02X} at ${1:04X}", opcode, pc.Raw);
throw std::runtime_error("Encountered unknown opcode");
@ -75,7 +75,7 @@ uint8_t CPU::Tick()
// Invoke addressing mode and instruction
accumulatorAddressing = false;
currentInstruction->Mode();
currentInstruction->Operation();
currentInstruction->Opcode();
APPEND_DEBUG_STRING(std::string(50 - debugString.str().length(), ' '));