aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Davidsaver <mdavidsaver@gmail.com>2016-04-06 20:17:31 -0400
committerMichael Davidsaver <mdavidsaver@gmail.com>2016-04-06 20:17:31 -0400
commit21f36fc59dce0b29239f3efd34700322556e9430 (patch)
tree9890e7a6c1f545844b80f3767c9bb7e4b0d65a15
parent3d4ce4b6b6ab5262b5d038cf90534c0116e9f4bd (diff)
minor
-rw-r--r--test12.S4
-rw-r--r--test4.c1
-rw-r--r--test7.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/test12.S b/test12.S
index 4bb7395..3dcac41 100644
--- a/test12.S
+++ b/test12.S
@@ -140,11 +140,11 @@ _vec_SVC:
bx lr
in_main:
-.string "In Main\n"
+.string "In Main, except UsageFault\n"
bad_HF:
.string "Unexpected HF\n"
in_UF:
-.string "In UsageFault\n"
+.string "In UsageFault (as expected)\n"
in_SVC:
.string "In SVC, shouldn't be"
diff --git a/test4.c b/test4.c
index 5bb6f3d..674006b 100644
--- a/test4.c
+++ b/test4.c
@@ -106,6 +106,7 @@ void main(void)
run_table.irq[1] = irq1;
out32(SCB(0xd0c), 0x05fa0000 | (PRIGROUP<<8));
+ test_equal("PRIGROUP", PRIGROUP, (in32(SCB(0xd0c))>>8)&0xff);
CPSID(i);
diff --git a/test7.c b/test7.c
index a8d7948..f03bbba 100644
--- a/test7.c
+++ b/test7.c
@@ -5,7 +5,7 @@
static
void hard(void)
{
- puts("In HardFault\n");
+ puts("In HardFault (as expected)\n");
abort();
}
@@ -20,7 +20,7 @@ void func(void)
void main(void)
{
run_table.hard = &hard;
- puts("Starting\n");
+ puts("Starting (expect HardFault)\n");
func();
puts("oops, I shouldn't be here\n");
}