Develop

Core/Core.vcxproj

@@ -94,7 +94,6 @@
     <ClInclude Include="Genesis\GenesisVdp.h" />
     <ClInclude Include="Genesis\GenesisCpu68k.h" />
     <ClInclude Include="Genesis\GenesisCpuZ80.h" />
-    <ClInclude Include="Genesis\IGenesisCoreBackend.h" />
     <ClInclude Include="Genesis\IGenesisPlatformCallbacks.h" />
     <ClInclude Include="Genesis\Input\GenesisController.h" />
     <ClInclude Include="Genesis\Debugger\GenesisDebugger.h" />
@@ -1385,4 +1384,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Core/Core.vcxproj.filters

@@ -3010,9 +3010,6 @@
     <ClInclude Include="Genesis\GenesisCpuZ80.h">
       <Filter>Genesis</Filter>
     </ClInclude>
-    <ClInclude Include="Genesis\IGenesisCoreBackend.h">
-      <Filter>Genesis</Filter>
-    </ClInclude>
     <ClInclude Include="Genesis\IGenesisPlatformCallbacks.h">
       <Filter>Genesis</Filter>
     </ClInclude>
@@ -3609,4 +3606,4 @@
       <UniqueIdentifier>{6eae784e-410d-48e6-a1b4-0a5a589db250}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>

Core/Debugger/LuaApi.cpp

@@ -30,6 +30,7 @@
 #include "Utilities/magic_enum.hpp"
 #include "Shared/MemoryOperationType.h"
 #include "Genesis/GenesisConsole.h"
+#include "Genesis/GenesisVdp.h"
 
 #ifdef _MSC_VER
 //TODO MSVC seems to trigger this by mistake because of the macros?
@@ -255,6 +256,7 @@ int LuaApi::GetLibrary(lua_State *lua)
 		{ "getLogWindowLog", LuaApi::GetLogWindowLog },
 		{ "getGenesisVdpDebugState", LuaApi::GetGenesisVdpDebugState },
 		{ "getGenesisVdpTrace", LuaApi::GetGenesisVdpTrace },
+		{ "setGenesisVdpTraceConfig", LuaApi::SetGenesisVdpTraceConfig },
 		{ NULL,NULL }
 	};
 
@@ -1393,6 +1395,61 @@ int LuaApi::GetGenesisVdpTrace(lua_State* lua)
 	return 1;
 }
 
+int LuaApi::SetGenesisVdpTraceConfig(lua_State* lua)
+{
+	lua_settop(lua, 2);
+	string kindName = luaL_checkstring(lua, 1);
+
+	GenesisTraceBufferKind kind;
+	if(kindName == "sprite") {
+		kind = GenesisTraceBufferKind::Sprite;
+	} else if(kindName == "compose") {
+		kind = GenesisTraceBufferKind::Compose;
+	} else if(kindName == "scroll") {
+		kind = GenesisTraceBufferKind::Scroll;
+	} else if(kindName == "hscrollDma") {
+		kind = GenesisTraceBufferKind::HScrollDma;
+	} else {
+		error("Invalid or unsupported Genesis trace buffer kind");
+	}
+
+	GenesisTraceConfig config = GenesisVdp::GetDefaultTraceConfig(kind);
+	if(!lua_isnoneornil(lua, 2)) {
+		luaL_checktype(lua, 2, LUA_TTABLE);
+
+		auto readOptionalU32 = [&](const char* field, uint32_t& value) {
+			lua_getfield(lua, 2, field);
+			if(lua_isinteger(lua, -1)) {
+				value = (uint32_t)lua_tointeger(lua, -1);
+			}
+			lua_pop(lua, 1);
+		};
+
+		auto readOptionalU16 = [&](const char* field, uint16_t& value) {
+			lua_getfield(lua, 2, field);
+			if(lua_isinteger(lua, -1)) {
+				value = (uint16_t)lua_tointeger(lua, -1);
+			}
+			lua_pop(lua, 1);
+		};
+
+		readOptionalU32("frameStart", config.FrameStart);
+		readOptionalU32("frameEnd", config.FrameEnd);
+		readOptionalU16("lineStart", config.LineStart);
+		readOptionalU16("lineEnd", config.LineEnd);
+		readOptionalU16("xStart", config.XStart);
+		readOptionalU16("xEnd", config.XEnd);
+		readOptionalU16("columnStart", config.ColumnStart);
+		readOptionalU16("columnEnd", config.ColumnEnd);
+		readOptionalU16("dstStart", config.DstStart);
+		readOptionalU16("dstEnd", config.DstEnd);
+		readOptionalU32("maxLines", config.MaxLines);
+	}
+
+	lua_pushboolean(lua, GenesisVdp::ConfigureTrace(kind, config) ? 1 : 0);
+	return 1;
+}
+
 int LuaApi::SetState(lua_State* lua)
 {
 	lua_settop(lua, 1);

Core/Debugger/LuaApi.h

@@ -85,6 +85,7 @@ class LuaApi
 	static int GetLogWindowLog(lua_State *lua);
 	static int GetGenesisVdpDebugState(lua_State* lua);
 	static int GetGenesisVdpTrace(lua_State* lua);
+	static int SetGenesisVdpTraceConfig(lua_State* lua);
 
 	static int SetState(lua_State *lua);
 	static int GetState(lua_State *lua);

Core/Genesis/GenesisConsole.cpp

@@ -134,10 +134,9 @@ GenesisConsole::~GenesisConsole()
 	}
 }
 
-void GenesisConsole::CreateBackend(GenesisCoreType coreType)
+void GenesisConsole::CreateBackend()
 {
-	(void)coreType;
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
+	if(_backend) {
 		return;
 	}
 
@@ -225,7 +224,7 @@ LoadRomResult GenesisConsole::LoadRom(VirtualFile& romFile)
 	if(cfg.Port2.Type == ControllerType::None) {
 		cfg.Port2.Type = ControllerType::GenesisController;
 	}
-	CreateBackend(cfg.CoreType);
+	CreateBackend();
 
 	// Create control manager
 	_controlManager.reset(new GenesisControlManager(_emu, this));
@@ -259,8 +258,8 @@ LoadRomResult GenesisConsole::LoadRom(VirtualFile& romFile)
 		_emu->RegisterMemory(MemoryType::GenesisWorkRam, const_cast<uint8_t*>(wramPtr), wramSize);
 	}
 
-	// Register Z80 RAM if native backend
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
+	// Register Z80 RAM
+	if(_backend) {
 		uint32_t audioRamSize = 0;
 		const uint8_t* audioRam = _backend->GetMemoryPointer(MemoryType::GenesisAudioRam, audioRamSize);
 		if(audioRam && audioRamSize > 0) {
@@ -306,7 +305,6 @@ void GenesisConsole::OnVideoFrame(const uint32_t* pixels, uint32_t pitch,
 
 	_frameWidth = targetWidth;
 	_frameHeight = targetHeight;
-	_frameCount++;
 
 	uint32_t pitchPixels = pitch / sizeof(uint32_t);
 	uint32_t needed = _frameWidth * _frameHeight;
@@ -385,7 +383,7 @@ void GenesisConsole::RunFrame()
 	_emu->ProcessEvent(EventType::EndFrame, CpuType::GenesisMain);
 
 	if(!_frameBuffer.empty() && _frameWidth > 0 && _frameHeight > 0) {
-		RenderedFrame frame((void*)_frameBuffer.data(), _frameWidth, _frameHeight, 1.0, _frameCount);
+		RenderedFrame frame((void*)_frameBuffer.data(), _frameWidth, _frameHeight, 1.0, _backend->GetFrameCount());
 		_emu->GetVideoDecoder()->UpdateFrame(frame, false, false);
 	}
 
@@ -430,10 +428,7 @@ ConsoleType GenesisConsole::GetConsoleType()
 
 vector<CpuType> GenesisConsole::GetCpuTypes()
 {
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
-		return { CpuType::GenesisMain, CpuType::GenesisZ80 };
-	}
-	return { CpuType::GenesisMain };
+	return { CpuType::GenesisMain, CpuType::GenesisZ80 };
 }
 
 RomFormat GenesisConsole::GetRomFormat()
@@ -450,7 +445,7 @@ PpuFrameInfo GenesisConsole::GetPpuFrame()
 {
 	PpuFrameInfo frame = {};
 	frame.FirstScanline = 0;
-	frame.FrameCount = _frameCount;
+	frame.FrameCount = _backend ? _backend->GetFrameCount() : 0;
 	frame.Width = _frameWidth;
 	frame.Height = _frameHeight;
 	frame.ScanlineCount = _isPAL ? 313 : 262;
@@ -587,14 +582,12 @@ void GenesisConsole::Serialize(Serializer& s)
 
 	vector<uint8_t> stateVec;
 
-	if(_backend->GetCoreType() == GenesisCoreType::Native) {
-		uint32_t stateFormatMarker = s.IsSaving() ? NativeStateFormatMarker : 0;
-		SV(stateFormatMarker);
-		if(!s.IsSaving() && stateFormatMarker != NativeStateFormatMarker) {
-			// Reject legacy Genesis states that predate the native format marker.
-			s.SetErrorFlag();
-			return;
-		}
+	uint32_t stateFormatMarker = s.IsSaving() ? NativeStateFormatMarker : 0;
+	SV(stateFormatMarker);
+	if(!s.IsSaving() && stateFormatMarker != NativeStateFormatMarker) {
+		// Reject legacy Genesis states that predate the native format marker.
+		s.SetErrorFlag();
+		return;
 	}
 
 	if(s.IsSaving()) {
@@ -612,36 +605,32 @@ void GenesisConsole::Serialize(Serializer& s)
 
 GenesisZ80State GenesisConsole::GetZ80DebugState()
 {
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
-		auto* nb = static_cast<GenesisNativeBackend*>(_backend.get());
-		return nb->GetZ80DebugState();
+	if(_backend) {
+		return _backend->GetZ80DebugState();
 	}
 	return {};
 }
 
 void GenesisConsole::SetZ80ProgramCounter(uint16_t addr)
 {
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
-		auto* nb = static_cast<GenesisNativeBackend*>(_backend.get());
-		nb->SetZ80ProgramCounter(addr);
+	if(_backend) {
+		_backend->SetZ80ProgramCounter(addr);
 	}
 }
 
 uint8_t GenesisConsole::GetVdpRegister(uint8_t index) const
 {
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
-		auto* nb = static_cast<GenesisNativeBackend*>(_backend.get());
-		return nb->GetVdpRegister(index);
+	if(_backend) {
+		return _backend->GetVdpRegister(index);
 	}
 
 	return 0;
 }
 
 uint16_t GenesisConsole::GetHVCounter() const
 {
-	if(_backend && _backend->GetCoreType() == GenesisCoreType::Native) {
-		auto* nb = static_cast<GenesisNativeBackend*>(_backend.get());
-		return nb->GetHVCounter();
+	if(_backend) {
+		return _backend->GetHVCounter();
 	}
 
 	return 0;

Core/Genesis/GenesisConsole.h

@@ -4,12 +4,12 @@
 #include "Shared/SettingTypes.h"
 #include "Genesis/GenesisTypes.h"
 #include "Genesis/IGenesisPlatformCallbacks.h"
-#include "Genesis/IGenesisCoreBackend.h"
 
 class Emulator;
 class VirtualFile;
 class BaseControlManager;
 class GenesisControlManager;
+class GenesisNativeBackend;
 class BaseVideoFilter;
 
 // ---------------------------------------------------------------------------
@@ -23,14 +23,13 @@ class GenesisConsole final : public IConsole, public IGenesisPlatformCallbacks
 	static GenesisConsole* _activeConsole;
 
 	Emulator*                    _emu = nullptr;
-	unique_ptr<IGenesisCoreBackend> _backend;
+	unique_ptr<GenesisNativeBackend> _backend;
 	unique_ptr<GenesisControlManager> _controlManager;
 
 	// Last rendered frame (ARGB8888)
 	vector<uint32_t>             _frameBuffer;
 	uint32_t                     _frameWidth  = 320;
 	uint32_t                     _frameHeight = 224;
-	uint32_t                     _frameCount  = 0;
 
 	ConsoleRegion                _region = ConsoleRegion::Ntsc;
 	bool                         _isPAL  = false;
@@ -40,7 +39,7 @@ class GenesisConsole final : public IConsole, public IGenesisPlatformCallbacks
 
 	void DetermineRegion(const string& filename, const vector<uint8_t>& romData);
 	void RefreshDebuggerMemoryViews();
-	void CreateBackend(GenesisCoreType coreType);
+	void CreateBackend();
 
 	// IGenesisPlatformCallbacks -----------------------------------------------
 	void OnVideoFrame(const uint32_t* pixels, uint32_t pitch,