Interpreter: Add slbie instruction and fix VRSAVE register size.

xenon-emu · Jan 21, 2025 · df80381 · df80381
1 parent b273e04
commit df80381
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Xenon/Core/XCPU/Interpreter/PPCInterpreter.cpp b/Xenon/Core/XCPU/Interpreter/PPCInterpreter.cpp
@@ -549,9 +549,10 @@ void PPCInterpreter::ppcExecuteSingleInstruction(PPU_STATE* hCore) {
 	case PPCInstruction::slbia:
 		PPCInterpreter_slbia(hCore);
 		break;
-		/*
 	case PPCInstruction::slbie:
+		PPCInterpreter_slbie(hCore);
 		break;
+		/*
 	case PPCInstruction::slbmfee:
 		break;
 	case PPCInstruction::slbmfev:

diff --git a/Xenon/Core/XCPU/Interpreter/PPCInterpreter.h b/Xenon/Core/XCPU/Interpreter/PPCInterpreter.h
@@ -159,7 +159,6 @@ namespace PPCInterpreter
 	void PPCInterpreter_rlwimix(PPU_STATE* hCore);
 	void PPCInterpreter_rlwnmx(PPU_STATE* hCore);
 	void PPCInterpreter_rlwinmx(PPU_STATE* hCore);
-	void PPCInterpreter_slbia(PPU_STATE* hCore);
 	void PPCInterpreter_sldx(PPU_STATE* hCore);
 	void PPCInterpreter_slwx(PPU_STATE* hCore);
 	void PPCInterpreter_sradx(PPU_STATE* hCore);
@@ -184,6 +183,8 @@ namespace PPCInterpreter
 
 	// System instructions
 	void PPCInterpreter_sc(PPU_STATE* hCore);
+	void PPCInterpreter_slbia(PPU_STATE* hCore);
+	void PPCInterpreter_slbie(PPU_STATE* hCore);
 	void PPCInterpreter_slbmte(PPU_STATE* hCore);
 	void PPCInterpreter_rfid(PPU_STATE* hCore);
 	void PPCInterpreter_tw(PPU_STATE* hCore);

diff --git a/Xenon/Core/XCPU/Interpreter/PPC_System.cpp b/Xenon/Core/XCPU/Interpreter/PPC_System.cpp
@@ -697,7 +697,7 @@ void PPCInterpreter::PPCInterpreter_mtspr(PPU_STATE* hCore)
 		hCore->ppuThread[hCore->currentThread].SPR.CFAR = hCore->ppuThread[hCore->currentThread].GPR[rD];
 		break;
 	case SPR_VRSAVE:
-		hCore->ppuThread[hCore->currentThread].SPR.VRSAVE = hCore->ppuThread[hCore->currentThread].GPR[rD];
+		hCore->ppuThread[hCore->currentThread].SPR.VRSAVE = static_cast<u32>(hCore->ppuThread[hCore->currentThread].GPR[rD]);
 		break;
 	case SPR_LPCR:
 		hCore->SPR.LPCR = hCore->ppuThread[hCore->currentThread].GPR[rD];

diff --git a/Xenon/Core/XCPU/PPU/PowerPC.h b/Xenon/Core/XCPU/PPU/PowerPC.h
@@ -157,14 +157,14 @@ union PVR
 // Segment Lookaside Buffer Entry
 struct SLBEntry
 {
+	u8 V;
 	u8 LP; // Large Page selector
 	u8 C;
 	u8 L;
 	u8 N;
 	u8 Kp;
 	u8 Ks;
 	u64 VSID;
-	u8 V;
 	u64 ESID;
 	u64 vsidReg;
 	u64 esidReg;
@@ -199,8 +199,8 @@ struct PPU_THREAD_SPRS
 	u64 CTR;
 	// CFAR: I dont know the definition.
 	u64 CFAR;
-	// Vector Register Save.
-	u64 VRSAVE;
+	// VXU Register Save.
+	u32 VRSAVE;
 	// Data Storage Interrupt Status Register
 	u64 DSISR;
 	// Data Address Register