From 8e64a854fc410983e9f6038122a9eae7512ef1f1 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Mon, 22 Apr 2024 21:56:53 -0400
Subject: [PATCH] Ensure all routes return; mildly decrease conditionals.

---
 InstructionSets/ARM/Registers.hpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/InstructionSets/ARM/Registers.hpp b/InstructionSets/ARM/Registers.hpp
index f1c690dd3..c3158b5d2 100644
--- a/InstructionSets/ARM/Registers.hpp
+++ b/InstructionSets/ARM/Registers.hpp
@@ -185,6 +185,7 @@ struct Registers {
 				// Unspecified; a guess.
 				case Exception::Reset:					return 0;
 			}
+			return 4;
 		}
 
 		/// Updates the program counter, interupt flags and link register if applicable to begin @c exception.
@@ -270,10 +271,11 @@ struct Registers {
 				case Condition::GT:	return !le();
 				case Condition::LE:	return le();
 
-				default:
 				case Condition::AL:	return true;
 				case Condition::NV:	return false;
 			}
+
+			return false;
 		}
 
 		/// Sets current execution mode.
@@ -345,23 +347,19 @@ struct Registers {
 		/// this will the the user-mode register. Otherwise it'll be that for the current mode. These references
 		/// are guaranteed to remain valid only until the next mode change.
 		uint32_t &reg(bool force_user_mode, uint32_t offset) {
-			if(!force_user_mode) {
-				return active_[offset];
-			}
-
 			switch(mode_) {
 				default:
 				case Mode::User: return active_[offset];
 
 				case Mode::Supervisor:
 				case Mode::IRQ:
-					if(offset == 13 || offset == 14) {
+					if(force_user_mode && (offset == 13 || offset == 14)) {
 						return user_registers_[offset - 8];
 					}
 					return active_[offset];
 
 				case Mode::FIQ:
-					if(offset >= 8 && offset < 15) {
+					if(force_user_mode && (offset >= 8 && offset < 15)) {
 						return user_registers_[offset - 8];
 					}
 					return active_[offset];