ARM: fix out-of-bounds accesses during CPU mode switch from or into a…

…n invalid mode
nba-emu · Jan 21, 2025 · 8c25d6b · 8c25d6b
1 parent e1990a7
commit 8c25d6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/nba/include/nba/save_state.hpp b/src/nba/include/nba/save_state.hpp
@@ -16,7 +16,7 @@ namespace nba {
 
 struct SaveState {
   static constexpr u32 kMagicNumber = 0x5353424E; // NBSS
-  static constexpr u32 kCurrentVersion = 9;
+  static constexpr u32 kCurrentVersion = 10;
 
   u32 magic;
   u32 version;
@@ -25,9 +25,9 @@ struct SaveState {
   struct ARM {
     struct RegisterFile {
       u32 gpr[16];
-      u32 bank[6][7];
+      u32 bank[7][7];
       u32 cpsr;
-      u32 spsr[6];
+      u32 spsr[7];
     } regs;
 
     struct Pipeline {

diff --git a/src/nba/src/arm/state.hpp b/src/nba/src/arm/state.hpp
@@ -28,8 +28,8 @@ enum Bank {
   BANK_ABT  = 3,
   BANK_IRQ  = 4,
   BANK_UND  = 5,
+  BANK_INVALID = 6,
   BANK_COUNT,
-  BANK_INVALID
 };
 
 enum Condition {