commit 43605ebe63c1f4fc5e736e6d05f86b0409ace167
parent 3c682cf3cdd37e4fa5831c2d30f0dc8f7a5c9577
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Sun, 2 Feb 2025 12:47:20 +0100
get rid of virtual functions for memory accesses
Diffstat:
4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/source/mqLib/mqmc.cpp b/source/mqLib/mqmc.cpp
@@ -10,6 +10,9 @@
#include "mqbuildconfig.h"
#include "mc68k/logging.h"
+#define MC68K_CLASS mqLib::MqMc
+#include "mc68k/musashiEntry.h"
+
namespace mqLib
{
constexpr uint32_t g_romAddress = 0x80000;
diff --git a/source/mqLib/mqmc.h b/source/mqLib/mqmc.h
@@ -48,13 +48,13 @@ namespace mqLib
void dumpROM(const char* _filename) const;
void dumpAssembly(uint32_t _first, uint32_t _count);
- private:
uint16_t readImm16(uint32_t _addr) override;
uint16_t read16(uint32_t addr) override;
uint8_t read8(uint32_t addr) override;
void write16(uint32_t addr, uint16_t val) override;
void write8(uint32_t addr, uint8_t val) override;
+ private:
void onReset() override;
uint32_t onIllegalInstruction(uint32_t opcode) override;
diff --git a/source/nord/n2x/n2xLib/n2xmc.cpp b/source/nord/n2x/n2xLib/n2xmc.cpp
@@ -7,6 +7,9 @@
#include "baseLib/filesystem.h"
+#define MC68K_CLASS n2x::Microcontroller
+#include "mc68k/musashiEntry.h"
+
namespace n2x
{
// OC2 = PGP4 = SDA
diff --git a/source/xtLib/xtUc.cpp b/source/xtLib/xtUc.cpp
@@ -6,6 +6,10 @@
#include "xtRom.h"
#include "mc68k/logging.h"
+
+#define MC68K_CLASS xt::XtUc
+#include "mc68k/musashiEntry.h"
+
#include "dsp56kEmu/utils.h"
namespace xt