From 707615ef8208b3522460b3f172882087e0b19b95 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 6 May 2018 14:24:56 -0400
Subject: [PATCH] PowerPC: Fix copying of the MSR.ILE bit to MSR.LE

The MSR.LE bit is supposed to be set to the value of MSR.ILE upon
entering an exception vector to control whether the environment in said
vector operates as little endian or big endian. If this bit is ORed into
the LE bit, then the scenario of operating in little endian but wanting
to take exceptions in big endian will be incorrectly handled.
---
 Source/Core/Core/PowerPC/PowerPC.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/Core/Core/PowerPC/PowerPC.cpp b/Source/Core/Core/PowerPC/PowerPC.cpp
index 619c213333..660d92e89b 100644
--- a/Source/Core/Core/PowerPC/PowerPC.cpp
+++ b/Source/Core/Core/PowerPC/PowerPC.cpp
@@ -400,7 +400,7 @@ void CheckExceptions()
   // SRR1 = MSR.Hex & 0x87C0FFFF;
   //
   // Copy ILE bit to LE
-  // MSR.LE |= MSR.ILE;
+  // MSR.LE = MSR.ILE;
   //
   // Clear MSR as specified
   // MSR.Hex &= ~0x04EF36; // 0x04FF36 also clears ME (only for machine check exception)
@@ -418,7 +418,7 @@ void CheckExceptions()
     SRR0 = NPC;
     // Page fault occurred
     SRR1 = (MSR.Hex & 0x87C0FFFF) | (1 << 30);
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000400;
 
@@ -430,7 +430,7 @@ void CheckExceptions()
     SRR0 = PC;
     // say that it's a trap exception
     SRR1 = (MSR.Hex & 0x87C0FFFF) | 0x20000;
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000700;
 
@@ -441,7 +441,7 @@ void CheckExceptions()
   {
     SRR0 = NPC;
     SRR1 = MSR.Hex & 0x87C0FFFF;
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000C00;
 
@@ -453,7 +453,7 @@ void CheckExceptions()
     // This happens a lot - GameCube OS uses deferred FPU context switching
     SRR0 = PC;  // re-execute the instruction
     SRR1 = MSR.Hex & 0x87C0FFFF;
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000800;
 
@@ -468,7 +468,7 @@ void CheckExceptions()
   {
     SRR0 = PC;
     SRR1 = MSR.Hex & 0x87C0FFFF;
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000300;
     // DSISR and DAR regs are changed in GenerateDSIException()
@@ -480,7 +480,7 @@ void CheckExceptions()
   {
     SRR0 = PC;
     SRR1 = MSR.Hex & 0x87C0FFFF;
-    MSR.LE |= MSR.ILE;
+    MSR.LE = MSR.ILE;
     MSR.Hex &= ~0x04EF36;
     PC = NPC = 0x00000600;
 
@@ -510,7 +510,7 @@ void CheckExternalExceptions()
       // Pokemon gets this "too early", it hasn't a handler yet
       SRR0 = NPC;
       SRR1 = MSR.Hex & 0x87C0FFFF;
-      MSR.LE |= MSR.ILE;
+      MSR.LE = MSR.ILE;
       MSR.Hex &= ~0x04EF36;
       PC = NPC = 0x00000500;
 
@@ -523,7 +523,7 @@ void CheckExternalExceptions()
     {
       SRR0 = NPC;
       SRR1 = MSR.Hex & 0x87C0FFFF;
-      MSR.LE |= MSR.ILE;
+      MSR.LE = MSR.ILE;
       MSR.Hex &= ~0x04EF36;
       PC = NPC = 0x00000F00;
 
@@ -534,7 +534,7 @@ void CheckExternalExceptions()
     {
       SRR0 = NPC;
       SRR1 = MSR.Hex & 0x87C0FFFF;
-      MSR.LE |= MSR.ILE;
+      MSR.LE = MSR.ILE;
       MSR.Hex &= ~0x04EF36;
       PC = NPC = 0x00000900;