Goodbye PowerPC, you can always be resurrected when the time comes

aliaspider · Dec 16, 2014 · a54e0cf · a54e0cf
1 parent 6643849
commit a54e0cf
Show file tree

Hide file tree

Showing 22 changed files with 7 additions and 6,667 deletions.
diff --git a/Common/ppcEmitter.cpp b/Common/ppcEmitter.cpp
diff --git a/Common/ppcEmitter.h b/Common/ppcEmitter.h
diff --git a/Core/HLE/ReplaceTables.cpp b/Core/HLE/ReplaceTables.cpp
@@ -807,8 +807,6 @@ static int Hook_kankabanchoutbr_download_frame() {
 #define JITFUNC(f) (&MIPSComp::Jit::f)
 #elif defined(MIPS)
 #define JITFUNC(f) (&MIPSComp::Jit::f)
-#elif defined(PPC)
-#define JITFUNC(f) (&MIPSComp::Jit::f)
 #endif
 
 // Can either replace with C functions or functions emitted in Asm/ArmAsm.

diff --git a/Core/MIPS/JitCommon/JitBlockCache.cpp b/Core/MIPS/JitCommon/JitBlockCache.cpp
@@ -49,8 +49,6 @@
 #elif defined(_M_IX86) || defined(_M_X64)
 #include "Common/x64Analyzer.h"
 #include "Core/MIPS/x86/Asm.h"
-#elif defined(PPC)
-#include "Core/MIPS/MIPS.h"
 #else
 #warning "Unsupported arch!"
 #include "Core/MIPS/MIPS.h"
@@ -425,7 +423,7 @@ void JitBlockCache::LinkBlockExits(int i) {
 				} while ((op & 0xFF000000) != 0xEA000000);
 				emit.BKPT(1);
 				emit.FlushIcache();
-
+				b.linkStatus[e] = true;
 #elif defined(_M_IX86) || defined(_M_X64)
 				XEmitter emit(b.exitPtrs[e]);
 				// Okay, this is a bit ugly, but we check here if it already has a JMP.
@@ -440,12 +438,8 @@ void JitBlockCache::LinkBlockExits(int i) {
 						emit.INT3();
 					}
 				}
-#elif defined(PPC)
-				PPCXEmitter emit(b.exitPtrs[e]);
-				emit.B(blocks_[destinationBlock].checkedEntry);
-				emit.FlushIcache();
-#endif
 				b.linkStatus[e] = true;
+#endif
 			}
 		}
 	}
@@ -590,12 +584,6 @@ void JitBlockCache::DestroyBlock(int block_num, bool invalidate) {
 	XEmitter emit((u8 *)b->checkedEntry);
 	emit.MOV(32, M(&mips_->pc), Imm32(b->originalAddress));
 	emit.JMP(MIPSComp::jit->Asm().dispatcher, true);
-#elif defined(PPC)
-	PPCXEmitter emit((u8 *)b->checkedEntry);
-	emit.MOVI2R(R3, b->originalAddress);
-	emit.STW(R0, CTXREG, offsetof(MIPSState, pc));
-	emit.B(MIPSComp::jit->dispatcher);
-	emit.FlushIcache();
 #endif
 }
 
@@ -631,8 +619,8 @@ int JitBlockCache::GetBlockExitSize() {
 	return 0;
 #elif defined(_M_IX86) || defined(_M_X64)
 	return 15;
-#elif defined(PPC)
-	// TODO
+#else
+#warning GetBlockExitSize unimplemented
 	return 0;
 #endif
 }
diff --git a/Core/MIPS/JitCommon/JitBlockCache.h b/Core/MIPS/JitCommon/JitBlockCache.h
@@ -42,10 +42,6 @@ typedef ArmGen::ARMXCodeBlock NativeCodeBlock;
 #include "Common/x64Emitter.h"
 namespace Gen { class XEmitter; }
 typedef Gen::XCodeBlock NativeCodeBlock;
-#elif defined(PPC)
-#include "Common/ppcEmitter.h"
-namespace PpcGen { class PPCXEmitter; }
-typedef PpcGen::PPCXCodeBlock NativeCodeBlock;
 #elif defined(MIPS)
 #include "Common/MipsEmitter.h"
 namespace MIPSGen { class MIPSEmitter; }

diff --git a/Core/MIPS/JitCommon/NativeJit.h b/Core/MIPS/JitCommon/NativeJit.h
@@ -23,10 +23,7 @@ struct JitBlock;
 #undef emit
 #endif
 
-#if defined(PPC) 
-#include "../PPC/PpcJit.h"
-typedef MIPSComp::Jit NativeJit;
-#elif defined(ARM)
+#if defined(ARM)
 #include "../ARM/ArmJit.h"
 typedef MIPSComp::ArmJit NativeJit;
 #elif defined(_M_IX86) || defined(_M_X64)

diff --git a/Core/MIPS/MIPSTables.cpp b/Core/MIPS/MIPSTables.cpp
@@ -94,8 +94,8 @@ struct MIPSInstruction {
 #define JITFUNC(f) (&Jit::f)
 #elif defined(MIPS)
 #define JITFUNC(f) (&Jit::f)
-#elif defined(PPC)
-#define JITFUNC(f) (&Jit::f)
+#else
+#error Unknown architecture
 #endif
 
 using namespace MIPSDis;

diff --git a/Core/MIPS/PPC/PpcAsm.cpp b/Core/MIPS/PPC/PpcAsm.cpp