Debugger: GBA - Fixed performance issue with trace logger

SourMesen · Mar 30, 2024 · 6468f37 · 6468f37
1 parent 4794934
commit 6468f37
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/Core/GBA/GbaConsole.cpp b/Core/GBA/GbaConsole.cpp
@@ -11,6 +11,7 @@
 #include "GBA/GbaDefaultVideoFilter.h"
 #include "GBA/Cart/GbaCart.h"
 #include "GBA/APU/GbaApu.h"
+#include "GBA/Debugger/DummyGbaCpu.h"
 #include "Debugger/DebugTypes.h"
 #include "Shared/CheatManager.h"
 #include "Shared/BatteryManager.h"
@@ -26,6 +27,9 @@
 GbaConsole::GbaConsole(Emulator* emu)
 {
 	_emu = emu;
+
+	GbaCpu::StaticInit();
+	DummyGbaCpu::StaticInit();
 }
 
 GbaConsole::~GbaConsole()

diff --git a/Core/GBA/GbaCpu.Arm.cpp b/Core/GBA/GbaCpu.Arm.cpp
@@ -3,7 +3,8 @@
 #include "GBA/GbaMemoryManager.h"
 #include "Shared/Emulator.h"
 
-static GbaArmOpCategory _armCategory[0x1000] = {};
+GbaArmOpCategory GbaCpu::_armCategory[0x1000];
+GbaCpu::Func GbaCpu::_armTable[0x1000];
 
 GbaArmOpCategory GbaCpu::GetArmOpCategory(uint32_t opCode)
 {

diff --git a/Core/GBA/GbaCpu.Thumb.cpp b/Core/GBA/GbaCpu.Thumb.cpp
@@ -2,7 +2,8 @@
 #include "GBA/GbaCpu.h"
 #include "GBA/GbaMemoryManager.h"
 
-static GbaThumbOpCategory _thumbCategory[0x100] = {};
+GbaThumbOpCategory GbaCpu::_thumbCategory[0x100];
+GbaCpu::Func GbaCpu::_thumbTable[0x100];
 
 GbaThumbOpCategory GbaCpu::GetThumbOpCategory(uint16_t _opCode)
 {

diff --git a/Core/GBA/GbaCpu.cpp b/Core/GBA/GbaCpu.cpp
@@ -10,9 +10,6 @@ void GbaCpu::Init(Emulator* emu, GbaMemoryManager* memoryManager)
 	_emu = emu;
 	_memoryManager = memoryManager;
 
-	InitArmOpTable();
-	InitThumbOpTable();
-
 	_state = {};
 	_state.Pipeline.ReloadRequested = true;
 
@@ -37,6 +34,12 @@ GbaCpu::~GbaCpu()
 {
 }
 
+void GbaCpu::StaticInit()
+{
+	InitArmOpTable();
+	InitThumbOpTable();
+}
+
 void GbaCpu::SwitchMode(GbaCpuMode mode)
 {
 	//High bit of mode is always set according to psr test

diff --git a/Core/GBA/GbaCpu.h b/Core/GBA/GbaCpu.h
@@ -25,8 +25,10 @@ class GbaCpu : public ISerializable
 	Emulator* _emu = nullptr;
 
 	typedef void(GbaCpu::* Func)();
-	Func _armTable[0x1000] = {};
-	Func _thumbTable[0x100] = {};
+	static Func _armTable[0x1000];
+	static Func _thumbTable[0x100];
+	static GbaArmOpCategory _armCategory[0x1000];
+	static GbaThumbOpCategory _thumbCategory[0x100];
 
 	uint32_t Add(uint32_t op1, uint32_t op2, bool carry, bool updateFlags);
 	uint32_t Sub(uint32_t op1, uint32_t op2, bool carry, bool updateFlags);
@@ -52,7 +54,7 @@ class GbaCpu : public ISerializable
 
 	GbaCpuFlags& GetSpsr();
 
-	void InitArmOpTable();
+	static void InitArmOpTable();
 	void ArmBranchExchangeRegister();
 	void ArmBranch();
 	void ArmMsr();
@@ -69,7 +71,7 @@ class GbaCpu : public ISerializable
 
 	bool CheckConditions(uint32_t condCode);
 
-	void InitThumbOpTable();
+	static void InitThumbOpTable();
 	void ThumbMoveShiftedRegister();
 	void ThumbAddSubtract();
 	void ThumbMoveCmpAddSub();
@@ -120,6 +122,8 @@ class GbaCpu : public ISerializable
 public:
 	virtual ~GbaCpu();
 
+	static void StaticInit();
+
 	void Init(Emulator* emu, GbaMemoryManager* memoryManager);
 
 	static GbaArmOpCategory GetArmOpCategory(uint32_t opCode);