From 881c10b40e2ee8c0f56709c4450718bf7bc11a4c Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 30 Nov 2016 16:18:02 -0800
Subject: [PATCH] ARM7: PSR mode bits should not get sign extended

---
 CHANGES       | 1 +
 src/arm/arm.h | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index eca96e19d..7491a984f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ Bugfixes:
  - GBA: Fix IRQs firing after already being cleared
  - All: Fix fullscreen config option being ignored
  - GBA: Add savegame override for Crash Bandicoot 2
+ - ARM7: PSR mode bits should not get sign extended
 Misc:
  - PSP2: Improved controller rumble
  - GB, GBA: Prevent loading null ROMs
diff --git a/src/arm/arm.h b/src/arm/arm.h
index 72231f24c..947cedf15 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -76,11 +76,11 @@ union PSR {
 		unsigned : 20;
 		unsigned i : 1;
 		unsigned f : 1;
-		enum ExecutionMode t : 1;
-		enum PrivilegeMode priv : 5;
+		unsigned t : 1;
+		unsigned priv : 5;
 #else
-		enum PrivilegeMode priv : 5;
-		enum ExecutionMode t : 1;
+		unsigned priv : 5;
+		unsigned t : 1;
 		unsigned f : 1;
 		unsigned i : 1;
 		unsigned : 20;