diff --git a/src/emucore/CartELF.cxx b/src/emucore/CartELF.cxx index e298f045b..9c111b783 100644 --- a/src/emucore/CartELF.cxx +++ b/src/emucore/CartELF.cxx @@ -325,6 +325,13 @@ CortexM0::err_t CartridgeELF::BusFallbackDelegate::fetch16( : CortexM0::errIntrinsic(CortexM0::ERR_UNMAPPED_FETCH16, address); } +CortexM0::err_t CartridgeELF::BusFallbackDelegate::read8(uInt32 address, uInt8& value, CortexM0& cortex) +{ + // TODO: remove this hack and replace it with a setting. + value = 0; + return 0; +} + inline uInt64 CartridgeELF::getArmCycles() const { return myCortexEmu.getCycles() + myArmCyclesOffset; diff --git a/src/emucore/CartELF.hxx b/src/emucore/CartELF.hxx index 56eb7afc4..68529844f 100644 --- a/src/emucore/CartELF.hxx +++ b/src/emucore/CartELF.hxx @@ -68,6 +68,7 @@ class CartridgeELF: public Cartridge { private: class BusFallbackDelegate: public CortexM0::BusTransactionDelegate { CortexM0::err_t fetch16(uInt32 address, uInt16& value, uInt8& op, CortexM0& cortex); + CortexM0::err_t read8(uInt32 address, uInt8& value, CortexM0& cortex); }; enum class ExecutionStage { @@ -119,7 +120,7 @@ class CartridgeELF: public Cartridge { BusFallbackDelegate myFallbackDelegate; ConsoleTiming myConsoleTiming{ConsoleTiming::ntsc}; - uInt32 myArmCyclesPer6502Cycle{80}; + uInt32 myArmCyclesPer6502Cycle{140}; Int64 myArmCyclesOffset{0};