diff --git a/llvm_build/CMakeFiles/generate.stamp b/llvm_build/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/CMakeFiles/generate.stamp
+++ b/llvm_build/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/cmake/modules/CMakeFiles/generate.stamp b/llvm_build/cmake/modules/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/cmake/modules/CMakeFiles/generate.stamp
+++ b/llvm_build/cmake/modules/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/include/llvm/CMakeFiles/generate.stamp b/llvm_build/include/llvm/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/include/llvm/CMakeFiles/generate.stamp
+++ b/llvm_build/include/llvm/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/include/llvm/IR/CMakeFiles/generate.stamp b/llvm_build/include/llvm/IR/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/include/llvm/IR/CMakeFiles/generate.stamp
+++ b/llvm_build/include/llvm/IR/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Analysis/CMakeFiles/generate.stamp b/llvm_build/lib/Analysis/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Analysis/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Analysis/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Analysis/IPA/CMakeFiles/generate.stamp b/llvm_build/lib/Analysis/IPA/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Analysis/IPA/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Analysis/IPA/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/AsmParser/CMakeFiles/generate.stamp b/llvm_build/lib/AsmParser/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/AsmParser/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/AsmParser/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Bitcode/CMakeFiles/generate.stamp b/llvm_build/lib/Bitcode/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Bitcode/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Bitcode/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Bitcode/Reader/CMakeFiles/generate.stamp b/llvm_build/lib/Bitcode/Reader/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Bitcode/Reader/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Bitcode/Reader/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Bitcode/Writer/CMakeFiles/generate.stamp b/llvm_build/lib/Bitcode/Writer/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Bitcode/Writer/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Bitcode/Writer/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/CMakeFiles/generate.stamp b/llvm_build/lib/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/CodeGen/AsmPrinter/CMakeFiles/generate.stamp b/llvm_build/lib/CodeGen/AsmPrinter/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/CodeGen/AsmPrinter/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/CodeGen/AsmPrinter/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/CodeGen/CMakeFiles/generate.stamp b/llvm_build/lib/CodeGen/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/CodeGen/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/CodeGen/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/CodeGen/SelectionDAG/CMakeFiles/generate.stamp b/llvm_build/lib/CodeGen/SelectionDAG/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/CodeGen/SelectionDAG/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/CodeGen/SelectionDAG/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/DebugInfo/CMakeFiles/generate.stamp b/llvm_build/lib/DebugInfo/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/DebugInfo/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/DebugInfo/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ExecutionEngine/CMakeFiles/generate.stamp b/llvm_build/lib/ExecutionEngine/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ExecutionEngine/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ExecutionEngine/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ExecutionEngine/Interpreter/CMakeFiles/generate.stamp b/llvm_build/lib/ExecutionEngine/Interpreter/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ExecutionEngine/Interpreter/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ExecutionEngine/Interpreter/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ExecutionEngine/JIT/CMakeFiles/generate.stamp b/llvm_build/lib/ExecutionEngine/JIT/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ExecutionEngine/JIT/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ExecutionEngine/JIT/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ExecutionEngine/MCJIT/CMakeFiles/generate.stamp b/llvm_build/lib/ExecutionEngine/MCJIT/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ExecutionEngine/MCJIT/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ExecutionEngine/MCJIT/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ExecutionEngine/RuntimeDyld/CMakeFiles/generate.stamp b/llvm_build/lib/ExecutionEngine/RuntimeDyld/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ExecutionEngine/RuntimeDyld/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ExecutionEngine/RuntimeDyld/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/IR/CMakeFiles/generate.stamp b/llvm_build/lib/IR/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/IR/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/IR/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/IRReader/CMakeFiles/generate.stamp b/llvm_build/lib/IRReader/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/IRReader/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/IRReader/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/LTO/CMakeFiles/generate.stamp b/llvm_build/lib/LTO/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/LTO/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/LTO/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/LineEditor/CMakeFiles/generate.stamp b/llvm_build/lib/LineEditor/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/LineEditor/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/LineEditor/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Linker/CMakeFiles/generate.stamp b/llvm_build/lib/Linker/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Linker/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Linker/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/MC/CMakeFiles/generate.stamp b/llvm_build/lib/MC/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/MC/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/MC/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/MC/MCAnalysis/CMakeFiles/generate.stamp b/llvm_build/lib/MC/MCAnalysis/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/MC/MCAnalysis/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/MC/MCAnalysis/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/MC/MCDisassembler/CMakeFiles/generate.stamp b/llvm_build/lib/MC/MCDisassembler/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/MC/MCDisassembler/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/MC/MCDisassembler/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/MC/MCParser/CMakeFiles/generate.stamp b/llvm_build/lib/MC/MCParser/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/MC/MCParser/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/MC/MCParser/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Object/CMakeFiles/generate.stamp b/llvm_build/lib/Object/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Object/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Object/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Option/CMakeFiles/generate.stamp b/llvm_build/lib/Option/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Option/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Option/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/ProfileData/CMakeFiles/generate.stamp b/llvm_build/lib/ProfileData/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/ProfileData/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/ProfileData/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Support/CMakeFiles/generate.stamp b/llvm_build/lib/Support/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Support/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Support/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/TableGen/CMakeFiles/generate.stamp b/llvm_build/lib/TableGen/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/TableGen/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/TableGen/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/CMakeFiles/generate.stamp b/llvm_build/lib/Target/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/AsmParser/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/AsmParser/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/AsmParser/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/AsmParser/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/Disassembler/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/Disassembler/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/Disassembler/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/Disassembler/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/InstPrinter/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/InstPrinter/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/InstPrinter/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/InstPrinter/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/MCTargetDesc/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/MCTargetDesc/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/MCTargetDesc/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/MCTargetDesc/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/TargetInfo/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/TargetInfo/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/TargetInfo/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/TargetInfo/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Target/X86/Utils/CMakeFiles/generate.stamp b/llvm_build/lib/Target/X86/Utils/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Target/X86/Utils/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Target/X86/Utils/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/Hello/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/Hello/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/Hello/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/Hello/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/IPO/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/IPO/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/IPO/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/IPO/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/InstCombine/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/InstCombine/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/InstCombine/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/InstCombine/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/Instrumentation/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/Instrumentation/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/Instrumentation/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/Instrumentation/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/ObjCARC/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/ObjCARC/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/ObjCARC/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/ObjCARC/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/Scalar/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/Scalar/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/Scalar/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/Scalar/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/Utils/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/Utils/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/Utils/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/Utils/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/lib/Transforms/Vectorize/CMakeFiles/generate.stamp b/llvm_build/lib/Transforms/Vectorize/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/lib/Transforms/Vectorize/CMakeFiles/generate.stamp
+++ b/llvm_build/lib/Transforms/Vectorize/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/projects/CMakeFiles/generate.stamp b/llvm_build/projects/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/projects/CMakeFiles/generate.stamp
+++ b/llvm_build/projects/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/llvm_build/utils/TableGen/CMakeFiles/generate.stamp b/llvm_build/utils/TableGen/CMakeFiles/generate.stamp
index 9b5f49fa9f..204caab22d 100644
--- a/llvm_build/utils/TableGen/CMakeFiles/generate.stamp
+++ b/llvm_build/utils/TableGen/CMakeFiles/generate.stamp
@@ -1 +1 @@
-# CMake generation timestamp file for this directory.
+# CMake generation timestamp file for this directory.
diff --git a/rpcs3/Emu/Cell/PPUInterpreter.h b/rpcs3/Emu/Cell/PPUInterpreter.h
index b5e8adf31a..0abb14d1e8 100644
--- a/rpcs3/Emu/Cell/PPUInterpreter.h
+++ b/rpcs3/Emu/Cell/PPUInterpreter.h
@@ -2252,11 +2252,11 @@ private:
 	{
 		if (is_r) // rldcr
 		{
-			RLDICR(ra, rs, (u32)CPU.GPR[rb], m_eb, rc);
+			RLDICR(ra, rs, (u32)CPU.GPR[rb] & 0x3F, m_eb, rc);
 		}
 		else // rldcl
 		{
-			RLDICL(ra, rs, (u32)CPU.GPR[rb], m_eb, rc);
+			RLDICL(ra, rs, (u32)CPU.GPR[rb] & 0x3F, m_eb, rc);
 		}
 	}
 	void CMP(u32 crfd, u32 l, u32 ra, u32 rb)
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
index 597fe41d81..3f0d94df6a 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
+++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.cpp
@@ -20,6 +20,9 @@
 
 using namespace llvm;
 
+u64  PPULLVMRecompiler::s_rotate_mask[64][64];
+bool PPULLVMRecompiler::s_rotate_mask_inited = false;
+
 PPULLVMRecompiler::PPULLVMRecompiler()
     : ThreadBase("PPULLVMRecompiler")
     , m_compilation_time(0.0)
@@ -61,6 +64,11 @@ PPULLVMRecompiler::PPULLVMRecompiler()
     m_fpm->doInitialization();
 
     m_disassembler = LLVMCreateDisasm(sys::getProcessTriple().c_str(), nullptr, 0, nullptr, nullptr);
+
+    if (!s_rotate_mask_inited) {
+        InitRotateMask();
+        s_rotate_mask_inited = true;
+    }
 }
 
 PPULLVMRecompiler::~PPULLVMRecompiler() {
@@ -1226,15 +1234,69 @@ void PPULLVMRecompiler::BCCTR(u32 bo, u32 bi, u32 bh, u32 lk) {
 }
 
 void PPULLVMRecompiler::RLWIMI(u32 ra, u32 rs, u32 sh, u32 mb, u32 me, bool rc) {
-    InterpreterCall("RLWIMI", &PPUInterpreter::RLWIMI, ra, rs, sh, mb, me, rc);
+    auto rs_i32  = GetGpr(rs, 32);
+    auto rs_i64  = m_ir_builder->CreateZExt(rs_i32, m_ir_builder->getInt64Ty());
+    auto rsh_i64 = m_ir_builder->CreateShl(rs_i64, 32);
+    rs_i64       = m_ir_builder->CreateOr(rs_i64, rsh_i64);
+    auto ra_i64  = GetGpr(ra);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    u64 mask = s_rotate_mask[32 + mb][32 + me];
+    res_i64  = m_ir_builder->CreateAnd(res_i64, mask);
+    ra_i64   = m_ir_builder->CreateAnd(ra_i64, ~mask);
+    res_i64  = m_ir_builder->CreateOr(res_i64, ra_i64);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLWIMI", &PPUInterpreter::RLWIMI, ra, rs, sh, mb, me, rc);
 }
 
 void PPULLVMRecompiler::RLWINM(u32 ra, u32 rs, u32 sh, u32 mb, u32 me, bool rc) {
-    InterpreterCall("RLWINM", &PPUInterpreter::RLWINM, ra, rs, sh, mb, me, rc);
+    auto rs_i32  = GetGpr(rs, 32);
+    auto rs_i64  = m_ir_builder->CreateZExt(rs_i32, m_ir_builder->getInt64Ty());
+    auto rsh_i64 = m_ir_builder->CreateShl(rs_i64, 32);
+    rs_i64       = m_ir_builder->CreateOr(rs_i64, rsh_i64);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[32 + mb][32 + me]);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLWINM", &PPUInterpreter::RLWINM, ra, rs, sh, mb, me, rc);
 }
 
 void PPULLVMRecompiler::RLWNM(u32 ra, u32 rs, u32 rb, u32 mb, u32 me, bool rc) {
-    InterpreterCall("RLWNM", &PPUInterpreter::RLWNM, ra, rs, rb, mb, me, rc);
+    auto rs_i32   = GetGpr(rs, 32);
+    auto rs_i64   = m_ir_builder->CreateZExt(rs_i32, m_ir_builder->getInt64Ty());
+    auto rsh_i64  = m_ir_builder->CreateShl(rs_i64, 32);
+    rs_i64        = m_ir_builder->CreateOr(rs_i64, rsh_i64);
+    auto rb_i64   = GetGpr(rb);
+    auto shl_i64  = m_ir_builder->CreateAnd(rb_i64, 0x1F);
+    auto shr_i64  = m_ir_builder->CreateSub(m_ir_builder->getInt64(32), shl_i64);
+    auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, shr_i64);
+    auto resh_i64 = m_ir_builder->CreateShl(rs_i64, shl_i64);
+    auto res_i64  = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    res_i64       = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[32 + mb][32 + me]);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLWNM", &PPUInterpreter::RLWNM, ra, rs, rb, mb, me, rc);
 }
 
 void PPULLVMRecompiler::ORI(u32 ra, u32 rs, u32 uimm16) {
@@ -1282,23 +1344,102 @@ void PPULLVMRecompiler::ANDIS_(u32 ra, u32 rs, u32 uimm16) {
 }
 
 void PPULLVMRecompiler::RLDICL(u32 ra, u32 rs, u32 sh, u32 mb, bool rc) {
-    InterpreterCall("RLDICL", &PPUInterpreter::RLDICL, ra, rs, sh, mb, rc);
+    auto rs_i64  = GetGpr(rs);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[mb][63]);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLDICL", &PPUInterpreter::RLDICL, ra, rs, sh, mb, rc);
 }
 
 void PPULLVMRecompiler::RLDICR(u32 ra, u32 rs, u32 sh, u32 me, bool rc) {
-    InterpreterCall("RLDICR", &PPUInterpreter::RLDICR, ra, rs, sh, me, rc);
+    auto rs_i64  = GetGpr(rs);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[0][me]);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLDICR", &PPUInterpreter::RLDICR, ra, rs, sh, me, rc);
 }
 
 void PPULLVMRecompiler::RLDIC(u32 ra, u32 rs, u32 sh, u32 mb, bool rc) {
-    InterpreterCall("RLDIC", &PPUInterpreter::RLDIC, ra, rs, sh, mb, rc);
+    auto rs_i64  = GetGpr(rs);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[mb][63 - sh]);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLDIC", &PPUInterpreter::RLDIC, ra, rs, sh, mb, rc);
 }
 
 void PPULLVMRecompiler::RLDIMI(u32 ra, u32 rs, u32 sh, u32 mb, bool rc) {
-    InterpreterCall("RLDIMI", &PPUInterpreter::RLDIMI, ra, rs, sh, mb, rc);
+    auto rs_i64  = GetGpr(rs);
+    auto ra_i64  = GetGpr(ra);
+    auto res_i64 = rs_i64;
+    if (sh) {
+        auto resl_i64 = m_ir_builder->CreateLShr(rs_i64, 64 - sh);
+        auto resh_i64 = m_ir_builder->CreateShl(rs_i64, sh);
+        res_i64       = m_ir_builder->CreateOr(resh_i64, resl_i64);
+    }
+
+    u64 mask = s_rotate_mask[mb][63 - sh];
+    res_i64  = m_ir_builder->CreateAnd(res_i64, mask);
+    ra_i64   = m_ir_builder->CreateAnd(ra_i64, ~mask);
+    res_i64  = m_ir_builder->CreateOr(res_i64, ra_i64);
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLDIMI", &PPUInterpreter::RLDIMI, ra, rs, sh, mb, rc);
 }
 
 void PPULLVMRecompiler::RLDC_LR(u32 ra, u32 rs, u32 rb, u32 m_eb, bool is_r, bool rc) {
-    InterpreterCall("RLDC_LR", &PPUInterpreter::RLDC_LR, ra, rs, rb, m_eb, is_r, rc);
+    auto rs_i64   = GetGpr(rs);
+    auto rb_i64   = GetGpr(rb);
+    auto shl_i64  = m_ir_builder->CreateAnd(rb_i64, 0x3F);
+    auto shr_i64  = m_ir_builder->CreateSub(m_ir_builder->getInt64(64), shl_i64);
+    auto resl_i64 = m_ir_builder->CreateLShr(rs_i64,shr_i64);
+    auto resh_i64 = m_ir_builder->CreateShl(rs_i64, shl_i64);
+    auto res_i64  = m_ir_builder->CreateOr(resh_i64, resl_i64);
+
+    if (is_r) {
+        res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[0][m_eb]);
+    } else {
+        res_i64 = m_ir_builder->CreateAnd(res_i64, s_rotate_mask[m_eb][63]);
+    }
+
+    SetGpr(ra, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+    //InterpreterCall("RLDC_LR", &PPUInterpreter::RLDC_LR, ra, rs, rb, m_eb, is_r, rc);
 }
 
 void PPULLVMRecompiler::CMP(u32 crfd, u32 l, u32 ra, u32 rb) {
@@ -1821,7 +1962,29 @@ void PPULLVMRecompiler::XOR(u32 ra, u32 rs, u32 rb, bool rc) {
 }
 
 void PPULLVMRecompiler::MFSPR(u32 rd, u32 spr) {
-    InterpreterCall("MFSPR", &PPUInterpreter::MFSPR, rd, spr);
+    Value * rd_i64;
+    auto    n      = (spr >> 5) | ((spr & 0x1f) << 5);
+
+    switch (n) {
+    case 0x001:
+        rd_i64 = GetXer();
+        break;
+    case 0x008:
+        rd_i64 = GetLr();
+        break;
+    case 0x009:
+        rd_i64 = GetCtr();
+        break;
+    case 0x100:
+        rd_i64 = GetUsprg0();
+        break;
+    default:
+        assert(0);
+        break;
+    }
+
+    SetGpr(rd, rd_i64);
+    //InterpreterCall("MFSPR", &PPUInterpreter::MFSPR, rd, spr);
 }
 
 void PPULLVMRecompiler::LWAX(u32 rd, u32 ra, u32 rb) {
@@ -1932,15 +2095,59 @@ void PPULLVMRecompiler::OR(u32 ra, u32 rs, u32 rb, bool rc) {
 }
 
 void PPULLVMRecompiler::DIVDU(u32 rd, u32 ra, u32 rb, u32 oe, bool rc) {
-    InterpreterCall("DIVDU", &PPUInterpreter::DIVDU, rd, ra, rb, oe, rc);
+    auto ra_i64  = GetGpr(ra);
+    auto rb_i64  = GetGpr(rb);
+    auto res_i64 = m_ir_builder->CreateUDiv(ra_i64, rb_i64);
+    SetGpr(rd, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+
+    // TODO implement oe
+    // TODO make sure an exception does not occur on divide by 0 and overflow
+    //InterpreterCall("DIVDU", &PPUInterpreter::DIVDU, rd, ra, rb, oe, rc);
 }
 
 void PPULLVMRecompiler::DIVWU(u32 rd, u32 ra, u32 rb, u32 oe, bool rc) {
-    InterpreterCall("DIVWU", &PPUInterpreter::DIVWU, rd, ra, rb, oe, rc);
+    auto ra_i32  = GetGpr(ra, 32);
+    auto rb_i32  = GetGpr(rb, 32);
+    auto res_i32 = m_ir_builder->CreateUDiv(ra_i32, rb_i32);
+    auto res_i64 = m_ir_builder->CreateZExt(res_i32, m_ir_builder->getInt64Ty());
+    SetGpr(rd, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+
+    // TODO implement oe
+    // TODO make sure an exception does not occur on divide by 0 and overflow
+    //InterpreterCall("DIVWU", &PPUInterpreter::DIVWU, rd, ra, rb, oe, rc);
 }
 
 void PPULLVMRecompiler::MTSPR(u32 spr, u32 rs) {
-    InterpreterCall("MTSPR", &PPUInterpreter::MTSPR, spr, rs);
+    auto rs_i64 = GetGpr(rs);
+    auto n      = (spr >> 5) | ((spr & 0x1f) << 5);
+
+    switch (n) {
+    case 0x001:
+        SetXer(rs_i64);
+        break;
+    case 0x008:
+        SetLr(rs_i64);
+        break;
+    case 0x009:
+        SetCtr(rs_i64);
+        break;
+    case 0x100:
+        SetUsprg0(rs_i64);
+        break;
+    default:
+        assert(0);
+        break;
+    }
+
+    //InterpreterCall("MTSPR", &PPUInterpreter::MTSPR, spr, rs);
 }
 
 void PPULLVMRecompiler::NAND(u32 ra, u32 rs, u32 rb, bool rc) {
@@ -1952,11 +2159,34 @@ void PPULLVMRecompiler::STVXL(u32 vs, u32 ra, u32 rb) {
 }
 
 void PPULLVMRecompiler::DIVD(u32 rd, u32 ra, u32 rb, u32 oe, bool rc) {
-    InterpreterCall("DIVD", &PPUInterpreter::DIVD, rd, ra, rb, oe, rc);
+    auto ra_i64  = GetGpr(ra);
+    auto rb_i64  = GetGpr(rb);
+    auto res_i64 = m_ir_builder->CreateSDiv(ra_i64, rb_i64);
+    SetGpr(rd, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+
+    // TODO implement oe
+    // TODO make sure an exception does not occur on divide by 0 and overflow
+    //InterpreterCall("DIVD", &PPUInterpreter::DIVD, rd, ra, rb, oe, rc);
 }
 
 void PPULLVMRecompiler::DIVW(u32 rd, u32 ra, u32 rb, u32 oe, bool rc) {
-    InterpreterCall("DIVW", &PPUInterpreter::DIVW, rd, ra, rb, oe, rc);
+    auto ra_i32  = GetGpr(ra, 32);
+    auto rb_i32  = GetGpr(rb, 32);
+    auto res_i32 = m_ir_builder->CreateSDiv(ra_i32, rb_i32);
+    auto res_i64 = m_ir_builder->CreateZExt(res_i32, m_ir_builder->getInt64Ty());
+    SetGpr(rd, res_i64);
+
+    if (rc) {
+        SetCrFieldSignedCmp(0, res_i64, m_ir_builder->getInt64(0));
+    }
+
+    // TODO implement oe
+    // TODO make sure an exception does not occur on divide by 0 and overflow
+    //InterpreterCall("DIVW", &PPUInterpreter::DIVW, rd, ra, rb, oe, rc);
 }
 
 void PPULLVMRecompiler::LVLX(u32 vd, u32 ra, u32 rb) {
@@ -1993,7 +2223,15 @@ void PPULLVMRecompiler::LWBRX(u32 rd, u32 ra, u32 rb) {
 }
 
 void PPULLVMRecompiler::LFSX(u32 frd, u32 ra, u32 rb) {
-    InterpreterCall("LFSX", &PPUInterpreter::LFSX, frd, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto mem_i32 = ReadMemory(addr_i64, 32);
+    SetFpr(frd, mem_i32);
+    //InterpreterCall("LFSX", &PPUInterpreter::LFSX, frd, ra, rb);
 }
 
 void PPULLVMRecompiler::SRW(u32 ra, u32 rs, u32 rb, bool rc) {
@@ -2013,7 +2251,13 @@ void PPULLVMRecompiler::LSWI(u32 rd, u32 ra, u32 nb) {
 }
 
 void PPULLVMRecompiler::LFSUX(u32 frd, u32 ra, u32 rb) {
-    InterpreterCall("LFSUX", &PPUInterpreter::LFSUX, frd, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    auto mem_i32  = ReadMemory(addr_i64, 32);
+    SetFpr(frd, mem_i32);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("LFSUX", &PPUInterpreter::LFSUX, frd, ra, rb);
 }
 
 void PPULLVMRecompiler::SYNC(u32 l) {
@@ -2021,11 +2265,25 @@ void PPULLVMRecompiler::SYNC(u32 l) {
 }
 
 void PPULLVMRecompiler::LFDX(u32 frd, u32 ra, u32 rb) {
-    InterpreterCall("LFDX", &PPUInterpreter::LFDX, frd, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto mem_i64 = ReadMemory(addr_i64, 64);
+    SetFpr(frd, mem_i64);
+    //InterpreterCall("LFDX", &PPUInterpreter::LFDX, frd, ra, rb);
 }
 
 void PPULLVMRecompiler::LFDUX(u32 frd, u32 ra, u32 rb) {
-    InterpreterCall("LFDUX", &PPUInterpreter::LFDUX, frd, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    auto mem_i64  = ReadMemory(addr_i64, 64);
+    SetFpr(frd, mem_i64);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("LFDUX", &PPUInterpreter::LFDUX, frd, ra, rb);
 }
 
 void PPULLVMRecompiler::STVLX(u32 vs, u32 ra, u32 rb) {
@@ -2048,7 +2306,15 @@ void PPULLVMRecompiler::STWBRX(u32 rs, u32 ra, u32 rb) {
 }
 
 void PPULLVMRecompiler::STFSX(u32 frs, u32 ra, u32 rb) {
-    InterpreterCall("STFSX", &PPUInterpreter::STFSX, frs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto frs_i32 = m_ir_builder->CreateBitCast(GetFpr(frs, 32), m_ir_builder->getInt32Ty());
+    WriteMemory(addr_i64, frs_i32);
+    //InterpreterCall("STFSX", &PPUInterpreter::STFSX, frs, ra, rb);
 }
 
 void PPULLVMRecompiler::STVRX(u32 vs, u32 ra, u32 rb) {
@@ -2056,7 +2322,14 @@ void PPULLVMRecompiler::STVRX(u32 vs, u32 ra, u32 rb) {
 }
 
 void PPULLVMRecompiler::STFSUX(u32 frs, u32 ra, u32 rb) {
-    InterpreterCall("STFSUX", &PPUInterpreter::STFSUX, frs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+
+    auto frs_i32 = m_ir_builder->CreateBitCast(GetFpr(frs, 32), m_ir_builder->getInt32Ty());
+    WriteMemory(addr_i64, frs_i32);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("STFSUX", &PPUInterpreter::STFSUX, frs, ra, rb);
 }
 
 void PPULLVMRecompiler::STSWI(u32 rd, u32 ra, u32 nb) {
@@ -2064,11 +2337,26 @@ void PPULLVMRecompiler::STSWI(u32 rd, u32 ra, u32 nb) {
 }
 
 void PPULLVMRecompiler::STFDX(u32 frs, u32 ra, u32 rb) {
-    InterpreterCall("STFDX", &PPUInterpreter::STFDX, frs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto frs_i64 = m_ir_builder->CreateBitCast(GetFpr(frs), m_ir_builder->getInt64Ty());
+    WriteMemory(addr_i64, frs_i64);
+    //InterpreterCall("STFDX", &PPUInterpreter::STFDX, frs, ra, rb);
 }
 
 void PPULLVMRecompiler::STFDUX(u32 frs, u32 ra, u32 rb) {
-    InterpreterCall("STFDUX", &PPUInterpreter::STFDUX, frs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+
+    auto frs_i64 = m_ir_builder->CreateBitCast(GetFpr(frs), m_ir_builder->getInt64Ty());
+    WriteMemory(addr_i64, frs_i64);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("STFDUX", &PPUInterpreter::STFDUX, frs, ra, rb);
 }
 
 void PPULLVMRecompiler::LVLXL(u32 vd, u32 ra, u32 rb) {
@@ -2125,7 +2413,14 @@ void PPULLVMRecompiler::STVLXL(u32 vs, u32 ra, u32 rb) {
 }
 
 void PPULLVMRecompiler::STHBRX(u32 rs, u32 ra, u32 rb) {
-    InterpreterCall("STHBRX", &PPUInterpreter::STHBRX, rs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    WriteMemory(addr_i64, GetGpr(rs, 16), false);
+    //InterpreterCall("STHBRX", &PPUInterpreter::STHBRX, rs, ra, rb);
 }
 
 void PPULLVMRecompiler::EXTSH(u32 ra, u32 rs, bool rc) {
@@ -2155,7 +2450,16 @@ void PPULLVMRecompiler::EXTSB(u32 ra, u32 rs, bool rc) {
 }
 
 void PPULLVMRecompiler::STFIWX(u32 frs, u32 ra, u32 rb) {
-    InterpreterCall("STFIWX", &PPUInterpreter::STFIWX, frs, ra, rb);
+    auto addr_i64 = GetGpr(rb);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto frs_i64 = m_ir_builder->CreateBitCast(GetFpr(frs), m_ir_builder->getInt64Ty());
+    auto frs_i32 = m_ir_builder->CreateTrunc(frs_i64, m_ir_builder->getInt32Ty());
+    WriteMemory(addr_i64, frs_i32);
+    //InterpreterCall("STFIWX", &PPUInterpreter::STFIWX, frs, ra, rb);
 }
 
 void PPULLVMRecompiler::EXTSW(u32 ra, u32 rs, bool rc) {
@@ -2349,35 +2653,94 @@ void PPULLVMRecompiler::STMW(u32 rs, u32 ra, s32 d) {
 }
 
 void PPULLVMRecompiler::LFS(u32 frd, u32 ra, s32 d) {
-    InterpreterCall("LFS", &PPUInterpreter::LFS, frd, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto mem_i32 = ReadMemory(addr_i64, 32);
+    SetFpr(frd, mem_i32);
+    //InterpreterCall("LFS", &PPUInterpreter::LFS, frd, ra, d);
 }
 
 void PPULLVMRecompiler::LFSU(u32 frd, u32 ra, s32 ds) {
-    InterpreterCall("LFSU", &PPUInterpreter::LFSU, frd, ra, ds);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)ds);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    auto mem_i32  = ReadMemory(addr_i64, 32);
+    SetFpr(frd, mem_i32);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("LFSU", &PPUInterpreter::LFSU, frd, ra, ds);
 }
 
 void PPULLVMRecompiler::LFD(u32 frd, u32 ra, s32 d) {
-    InterpreterCall("LFD", &PPUInterpreter::LFD, frd, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto mem_i64 = ReadMemory(addr_i64, 64);
+    SetFpr(frd, mem_i64);
+    //InterpreterCall("LFD", &PPUInterpreter::LFD, frd, ra, d);
 }
 
 void PPULLVMRecompiler::LFDU(u32 frd, u32 ra, s32 ds) {
-    InterpreterCall("LFDU", &PPUInterpreter::LFDU, frd, ra, ds);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)ds);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+
+    auto mem_i64 = ReadMemory(addr_i64, 64);
+    SetFpr(frd, mem_i64);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("LFDU", &PPUInterpreter::LFDU, frd, ra, ds);
 }
 
 void PPULLVMRecompiler::STFS(u32 frs, u32 ra, s32 d) {
-    InterpreterCall("STFS", &PPUInterpreter::STFS, frs, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto frs_i32 = m_ir_builder->CreateBitCast(GetFpr(frs, 32), m_ir_builder->getInt32Ty());
+    WriteMemory(addr_i64, frs_i32);
+    //InterpreterCall("STFS", &PPUInterpreter::STFS, frs, ra, d);
 }
 
 void PPULLVMRecompiler::STFSU(u32 frs, u32 ra, s32 d) {
-    InterpreterCall("STFSU", &PPUInterpreter::STFSU, frs, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+
+    auto frs_i32 = m_ir_builder->CreateBitCast(GetFpr(frs, 32), m_ir_builder->getInt32Ty());
+    WriteMemory(addr_i64, frs_i32);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("STFSU", &PPUInterpreter::STFSU, frs, ra, d);
 }
 
 void PPULLVMRecompiler::STFD(u32 frs, u32 ra, s32 d) {
-    InterpreterCall("STFD", &PPUInterpreter::STFD, frs, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    if (ra) {
+        auto ra_i64 = GetGpr(ra);
+        addr_i64    = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+    }
+
+    auto frs_i64 = m_ir_builder->CreateBitCast(GetFpr(frs), m_ir_builder->getInt64Ty());
+    WriteMemory(addr_i64, frs_i64);
+    //InterpreterCall("STFD", &PPUInterpreter::STFD, frs, ra, d);
 }
 
 void PPULLVMRecompiler::STFDU(u32 frs, u32 ra, s32 d) {
-    InterpreterCall("STFDU", &PPUInterpreter::STFDU, frs, ra, d);
+    auto addr_i64 = (Value *)m_ir_builder->getInt64((s64)d);
+    auto ra_i64   = GetGpr(ra);
+    addr_i64      = m_ir_builder->CreateAdd(ra_i64, addr_i64);
+
+    auto frs_i64 = m_ir_builder->CreateBitCast(GetFpr(frs), m_ir_builder->getInt64Ty());
+    WriteMemory(addr_i64, frs_i64);
+    SetGpr(ra, addr_i64);
+    //InterpreterCall("STFDU", &PPUInterpreter::STFDU, frs, ra, d);
 }
 
 void PPULLVMRecompiler::LD(u32 rd, u32 ra, s32 ds) {
@@ -2526,6 +2889,12 @@ void PPULLVMRecompiler::FSUB(u32 frd, u32 fra, u32 frb, bool rc) {
 }
 
 void PPULLVMRecompiler::FADD(u32 frd, u32 fra, u32 frb, bool rc) {
+    //auto ra_f64  = GetFpr(fra);
+    //auto rb_f64  = GetFpr(frb);
+    //auto res_f64 = m_ir_builder->CreateFAdd(ra_f64, rb_f64);
+    //SetFpr(frd, res_f64);
+
+    // TODO: Set FPRF
     InterpreterCall("FADD", &PPUInterpreter::FADD, frd, fra, frb, rc);
 }
 
@@ -2847,6 +3216,32 @@ void PPULLVMRecompiler::SetCr6AfterVectorCompare(u32 vr) {
     SetCr(cr_i32);
 }
 
+Value * PPULLVMRecompiler::GetLr() {
+    auto lr_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, LR));
+    auto lr_i64_ptr = m_ir_builder->CreateBitCast(lr_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    return m_ir_builder->CreateLoad(lr_i64_ptr);
+}
+
+void PPULLVMRecompiler::SetLr(Value * val_x64) {
+    auto val_i64     = m_ir_builder->CreateBitCast(val_x64, m_ir_builder->getInt64Ty());
+    auto lr_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, LR));
+    auto lr_i64_ptr = m_ir_builder->CreateBitCast(lr_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    m_ir_builder->CreateStore(val_i64, lr_i64_ptr);
+}
+
+Value * PPULLVMRecompiler::GetCtr() {
+    auto ctr_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, CTR));
+    auto ctr_i64_ptr = m_ir_builder->CreateBitCast(ctr_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    return m_ir_builder->CreateLoad(ctr_i64_ptr);
+}
+
+void PPULLVMRecompiler::SetCtr(Value * val_x64) {
+    auto val_i64     = m_ir_builder->CreateBitCast(val_x64, m_ir_builder->getInt64Ty());
+    auto ctr_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, CTR));
+    auto ctr_i64_ptr = m_ir_builder->CreateBitCast(ctr_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    m_ir_builder->CreateStore(val_i64, ctr_i64_ptr);
+}
+
 Value * PPULLVMRecompiler::GetXer() {
     auto xer_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, XER));
     auto xer_i64_ptr = m_ir_builder->CreateBitCast(xer_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
@@ -2880,6 +3275,47 @@ void PPULLVMRecompiler::SetXerSo(Value * so) {
     SetXer(xer_i64);
 }
 
+Value * PPULLVMRecompiler::GetUsprg0() {
+    auto usrpg0_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, USPRG0));
+    auto usprg0_i64_ptr = m_ir_builder->CreateBitCast(usrpg0_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    return m_ir_builder->CreateLoad(usprg0_i64_ptr);
+}
+
+void PPULLVMRecompiler::SetUsprg0(Value * val_x64) {
+    auto val_i64        = m_ir_builder->CreateBitCast(val_x64, m_ir_builder->getInt64Ty());
+    auto usprg0_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, USPRG0));
+    auto usprg0_i64_ptr = m_ir_builder->CreateBitCast(usprg0_i8_ptr, m_ir_builder->getInt64Ty()->getPointerTo());
+    m_ir_builder->CreateStore(val_i64, usprg0_i64_ptr);
+}
+
+Value * PPULLVMRecompiler::GetFpr(u32 r, u32 bits) {
+    auto r_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, FPR[r]));
+    auto r_f64_ptr = m_ir_builder->CreateBitCast(r_i8_ptr, m_ir_builder->getDoubleTy()->getPointerTo());
+    auto r_f64     = m_ir_builder->CreateLoad(r_f64_ptr);
+    if (bits == 32) {
+        return m_ir_builder->CreateFPTrunc(r_f64, m_ir_builder->getFloatTy());
+    } else {
+        return r_f64;
+    }
+}
+
+void PPULLVMRecompiler::SetFpr(u32 r, Value * val) {
+    auto r_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, FPR[r]));
+    auto r_f64_ptr = m_ir_builder->CreateBitCast(r_i8_ptr, m_ir_builder->getDoubleTy()->getPointerTo());
+
+    Value* val_f64;
+    if (val->getType()->isDoubleTy() || val->getType()->isIntegerTy(64)) {
+        val_f64 = m_ir_builder->CreateBitCast(val, m_ir_builder->getDoubleTy());
+    } else if (val->getType()->isFloatTy() || val->getType()->isIntegerTy(32)) {
+        auto val_f32 = m_ir_builder->CreateBitCast(val, m_ir_builder->getFloatTy());
+        val_f64      = m_ir_builder->CreateFPExt(val_f32, m_ir_builder->getDoubleTy());
+    } else {
+        assert(0);
+    }
+
+    m_ir_builder->CreateStore(val_f64, r_f64_ptr);
+}
+
 Value * PPULLVMRecompiler::GetVscr() {
     auto vscr_i8_ptr  = m_ir_builder->CreateConstGEP1_32(GetPPUState(), (unsigned int)offsetof(PPUThread, VSCR));
     auto vscr_i32_ptr = m_ir_builder->CreateBitCast(vscr_i8_ptr, m_ir_builder->getInt32Ty()->getPointerTo());
@@ -3065,6 +3501,15 @@ Value * PPULLVMRecompiler::Call(const char * name, Func function, Args... args)
     return m_ir_builder->CreateCall(fn, fn_args);
 }
 
+void PPULLVMRecompiler::InitRotateMask() {
+    for (u32 mb = 0; mb < 64; mb++) {
+        for (u32 me = 0; me < 64; me++) {
+            u64 mask = ((u64)-1 >> mb) ^ ((me >= 63) ? 0 : (u64)-1 >> (me + 1));
+            s_rotate_mask[mb][me] = mb > me ? ~mask : mask;
+        }
+    }
+}
+
 u32                 PPULLVMEmulator::s_num_instances    = 0;
 std::mutex          PPULLVMEmulator::s_recompiler_mutex;
 PPULLVMRecompiler * PPULLVMEmulator::s_recompiler       = nullptr;
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompiler.h b/rpcs3/Emu/Cell/PPULLVMRecompiler.h
index dea8018b29..c8d067b3a7 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompiler.h
+++ b/rpcs3/Emu/Cell/PPULLVMRecompiler.h
@@ -558,6 +558,18 @@ private:
     /// Set CR6 based on the result of the vector compare instruction
     void SetCr6AfterVectorCompare(u32 vr);
 
+    /// Get LR
+    llvm::Value * GetLr();
+
+    /// Set LR
+    void SetLr(llvm::Value * val_x64);
+
+    /// Get CTR
+    llvm::Value * GetCtr();
+
+    /// Set CTR
+    void SetCtr(llvm::Value * val_x64);
+
     /// Load XER and convert it to an i64
     llvm::Value * GetXer();
 
@@ -576,6 +588,18 @@ private:
     /// Set the SO bit of XER
     void SetXerSo(llvm::Value * so);
 
+    /// Get USPRG0
+    llvm::Value * GetUsprg0();
+
+    /// Set USPRG0
+    void SetUsprg0(llvm::Value * val_x64);
+
+    /// Get FPR
+    llvm::Value * GetFpr(u32 r, u32 bits = 64);
+
+    /// Set FPR
+    void SetFpr(u32 r, llvm::Value * val);
+
     /// Load VSCR
     llvm::Value * GetVscr();
 
@@ -618,6 +642,15 @@ private:
 
     /// Excute a test
     void RunTest(const char * name, std::function<void()> test_case, std::function<void()> input, std::function<bool(std::string & msg)> check_result);
+
+    /// A mask used in rotate instructions
+    static u64 s_rotate_mask[64][64];
+
+    /// A flag indicating whether s_rotate_mask has been initialised or not
+    static bool s_rotate_mask_inited;
+
+    /// Initialse s_rotate_mask
+    static void InitRotateMask();
 };
 
 /// PPU emulator that uses LLVM to convert PPU instructions to host CPU instructions
diff --git a/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp b/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
index 30f34bf326..55028bd3f4 100644
--- a/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
+++ b/rpcs3/Emu/Cell/PPULLVMRecompilerTests.cpp
@@ -373,15 +373,28 @@ void PPULLVMRecompiler::RunAllTests(PPUThread * ppu_state, u64 base_address, PPU
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(CRORC, 0, 5, 3, 4, 5);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(CROR, 0, 5, 6, 7, 0);
     // TODO: BCCTR
-    // TODO: RLWIMI
-    // TODO: RLWINM
-    // TODO: RLWNM
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWIMI, 0, 5, 7, 8, 9, 12, 25, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWIMI, 5, 5, 21, 22, 21, 18, 24, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWINM, 0, 5, 7, 8, 9, 12, 25, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWINM, 5, 5, 21, 22, 21, 18, 24, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWNM, 0, 5, 7, 8, 9, 12, 25, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLWNM, 5, 5, 21, 22, 21, 18, 24, 1);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ORI, 0, 5, 25, 29, 12345);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ORIS, 0, 5, 7, 31, -12345);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(XORI, 0, 5, 0, 19, 12345);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(XORIS, 0, 5, 3, 14, -12345);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ANDI_, 0, 5, 16, 7, 12345);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ANDIS_, 0, 5, 23, 21, -12345);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDICL, 0, 5, 7, 8, 9, 12, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDICL, 5, 5, 21, 22, 43, 43, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDICR, 0, 5, 7, 8, 0, 12, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDICR, 5, 5, 21, 22, 63, 43, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDIC, 0, 5, 7, 8, 9, 12, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDIC, 5, 5, 21, 22, 23, 43, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDIMI, 0, 5, 7, 8, 9, 12, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDIMI, 5, 5, 21, 22, 23, 43, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDC_LR, 0, 5, 7, 8, 9, 12, 0, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(RLDC_LR, 5, 5, 21, 22, 23, 43, 1, 1);
 
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ADD, 0, 5, 7, 8, 9, 0, 0);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(ADD, 5, 5, 21, 22, 23, 0, 1);
@@ -401,6 +414,14 @@ void PPULLVMRecompiler::RunAllTests(PPUThread * ppu_state, u64 base_address, PPU
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MULLD, 5, 5, 21, 22, 23, 0, 1);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MULLW, 0, 5, 7, 8, 9, 0, 0);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MULLW, 5, 5, 21, 22, 23, 0, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVD, 0, 5, 7, 8, 9, 0, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVD, 5, 5, 21, 22, 23, 0, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVDU, 0, 5, 7, 8, 9, 0, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVDU, 5, 5, 21, 22, 23, 0, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVW, 0, 5, 7, 8, 9, 0, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVW, 5, 5, 21, 22, 23, 0, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVWU, 0, 5, 7, 8, 9, 0, 0);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(DIVWU, 5, 5, 21, 22, 23, 0, 1);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(AND, 0, 5, 7, 8, 9, 0);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(AND, 5, 5, 21, 22, 23, 1);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(OR, 0, 5, 7, 8, 9, 0);
@@ -419,6 +440,16 @@ void PPULLVMRecompiler::RunAllTests(PPUThread * ppu_state, u64 base_address, PPU
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(EXTSH, 5, 5, 6, 9, 1);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(EXTSW, 0, 5, 25, 29, 0);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(EXTSW, 5, 5, 25, 29, 1);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MTSPR, 0, 5, 0x20, 5);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MTSPR, 5, 5, 0x100, 5);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MTSPR, 10, 5, 0x120, 5);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MTSPR, 15, 5, 0x8, 5);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MFSPR, 0, 5, 5, 0x20);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MFSPR, 5, 5, 5, 0x100);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MFSPR, 10, 5, 5, 0x120);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(MFSPR, 15, 5, 5, 0x8);
+
+    //VERIFY_INSTRUCTION_AGAINST_INTERPRETER_USING_RANDOM_INPUT(FADD, 0, 5, 25, 29, 1, 0);
 
     PPURegState input;
     input.SetRandom();
@@ -466,6 +497,18 @@ void PPULLVMRecompiler::RunAllTests(PPUThread * ppu_state, u64 base_address, PPU
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LDX, 1, input, 5, 14, 23);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LDUX, 0, input, 5, 14, 23);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LDBRX, 0, input, 5, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFS, 0, input, 5, 0, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFS, 1, input, 5, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFSU, 0, input, 5, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFSX, 0, input, 5, 0, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFSX, 1, input, 5, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFSUX, 0, input, 5, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFD, 0, input, 5, 0, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFD, 1, input, 5, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFDU, 0, input, 5, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFDX, 0, input, 5, 0, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFDX, 1, input, 5, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(LFDUX, 0, input, 5, 14, 23);
 
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STB, 0, input, 3, 0, 0x10000);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STB, 1, input, 3, 14, 0x10000);
@@ -493,6 +536,19 @@ void PPULLVMRecompiler::RunAllTests(PPUThread * ppu_state, u64 base_address, PPU
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STDX, 0, input, 3, 0, 23);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STDX, 1, input, 3, 14, 23);
     VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STDUX, 0, input, 3, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFS, 0, input, 3, 0, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFS, 1, input, 3, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFSU, 0, input, 3, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFSX, 0, input, 3, 0, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFSX, 1, input, 3, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFSUX, 0, input, 3, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFD, 0, input, 3, 0, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFD, 1, input, 3, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFDU, 0, input, 3, 14, 0x10000);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFDX, 0, input, 3, 0, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFDX, 1, input, 3, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFDUX, 0, input, 3, 14, 23);
+    VERIFY_INSTRUCTION_AGAINST_INTERPRETER(STFIWX, 0, input, 3, 14, 23);
 
     initial_state.Store(*ppu_state);
 }