From a86299929e5ad222adb9c2a22ab9de0f48a1f1ca Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 27 Nov 2015 22:11:00 -0500
Subject: minor

---
 init-m-test9.S  | 6 ++++++
 test11-buserr.c | 2 +-
 test9.c         | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/init-m-test9.S b/init-m-test9.S
index 67f15a6..25df379 100644
--- a/init-m-test9.S
+++ b/init-m-test9.S
@@ -47,6 +47,12 @@ _start:
   mrs r0, CONTROL
   str r0, [r3], #4
 
+  mrs r0, MSP
+  str r0, [r3], #4
+
+  mrs r0, PSP
+  str r0, [r3], #4
+
   ldr r2, =0xe000e000
 
   ldr r0, [r2, #0xd00] /* CPUID */
diff --git a/test11-buserr.c b/test11-buserr.c
index fcc3b3e..4b625e7 100644
--- a/test11-buserr.c
+++ b/test11-buserr.c
@@ -227,7 +227,7 @@ void main(void)
     puts("# w/o MPU, hits background mapping\n");
 
     puts("1. Cause BusFault 0xe100ffff\n");
-    out32((void*)0xe100ffff, 0);
+    out32((void*)0xe100fff0, 0);
     check_fault(2);
     puts("Back in Main\n");
 
diff --git a/test9.c b/test9.c
index 3b03d60..05ce68d 100644
--- a/test9.c
+++ b/test9.c
@@ -2,6 +2,8 @@
  */
 #include "armv7m.h"
 
+char _main_stack_top;
+
 static
 void test_equal(const char *msg, uint32_t lhs, uint32_t rhs)
 {
@@ -21,6 +23,8 @@ struct early_state_t {
     uint32_t FAULTMASK;
     uint32_t BASEPRI;
     uint32_t CONTROL;
+    uint32_t MSP;
+    uint32_t PSP;
     uint32_t cpuid;
     uint32_t icsr;
     uint32_t vtor;
@@ -46,6 +50,8 @@ void main(void)
     TEST(FAULTMASK, 0);
     TEST(BASEPRI, 0);
     TEST(CONTROL, 0);
+    TEST(MSP, (uint32_t)&_main_stack_top);
+    TEST(PSP, 0);
     puts("# cpuid ");
     puthex(early_state.cpuid);
     putc('\n');
-- 
cgit v1.2.3