aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-04-06 17:05:13 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-04-06 17:05:13 +0100
commite3cfbb872b84606ea1483340ce713549ca794032 (patch)
tree816f1cd5f4f46a6c2ad87398bea7f53bfe7dae91
parent3f4e9a6995d3646319e3f34e0e1d458d60ebbc7a (diff)
test8: Fix indentation
Fix the indentation to 4-space indent; whitespace only change. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--test8.c264
1 files changed, 132 insertions, 132 deletions
diff --git a/test8.c b/test8.c
index 5c5d8c9..f65ec79 100644
--- a/test8.c
+++ b/test8.c
@@ -11,14 +11,14 @@ char privonly[1024] __attribute__((aligned(1024)));
static
void try(volatile char *p)
{
- uint32_t tval = 0;
- puts("Try ");
- puthex((uint32_t)p);
- putc('\n');
- __asm__ ("mov %r0, #'X'; ldr %r0, [%r1]" : "+r"(tval) : "r"(p) :);
- puts("Got ");
- putc(tval);
- putc('\n');
+ uint32_t tval = 0;
+ puts("Try ");
+ puthex((uint32_t)p);
+ putc('\n');
+ __asm__ ("mov %r0, #'X'; ldr %r0, [%r1]" : "+r"(tval) : "r"(p) :);
+ puts("Got ");
+ putc(tval);
+ putc('\n');
}
static volatile
@@ -27,191 +27,191 @@ unsigned expect_fault = 1;
static
void checkfault(unsigned v)
{
- if(v!=expect_fault) {
- puts("expect_fault ");
- puthex(expect_fault);
- puts(" != ");
- puthex(v);
- putc('\n');
- abort();
- }
+ if(v!=expect_fault) {
+ puts("expect_fault ");
+ puthex(expect_fault);
+ puts(" != ");
+ puthex(v);
+ putc('\n');
+ abort();
+ }
}
void hard(uint32_t *sp)
{
- if(expect_fault==10) {
- sp = get_src_stack(sp);
- inst_skip(sp);
- puts("HardFault access offlimits\n");
- try(offlimits);
- expect_fault = 11;
- return;
- }
- puts("Unexpected HardFault!!\n");
- abort();
+ if(expect_fault==10) {
+ sp = get_src_stack(sp);
+ inst_skip(sp);
+ puts("HardFault access offlimits\n");
+ try(offlimits);
+ expect_fault = 11;
+ return;
+ }
+ puts("Unexpected HardFault!!\n");
+ abort();
}
static __attribute__((naked))
void hard_entry(void)
{
- asm("mov r0, sp");
- asm("b hard");
+ asm("mov r0, sp");
+ asm("b hard");
}
void mem(uint32_t *sp)
{
- sp = get_src_stack(sp);
- inst_skip(sp);
- puts("In MemFault\n Addr ");
- puthex(in32((void*)0xe000ed34));
- puts(" From ");
- puthex(sp[6]);
- putc('\n');
-
- switch(expect_fault) {
- case 2: /* expected */
- expect_fault = 3;
- break;
- case 1:
- puts("Unexpected MemFault!!\n");
- abort();
- default:
- puts("Unexpected state ");
- puthex(expect_fault);
- putc('\n');
- abort();
- }
+ sp = get_src_stack(sp);
+ inst_skip(sp);
+ puts("In MemFault\n Addr ");
+ puthex(in32((void*)0xe000ed34));
+ puts(" From ");
+ puthex(sp[6]);
+ putc('\n');
+
+ switch(expect_fault) {
+ case 2: /* expected */
+ expect_fault = 3;
+ break;
+ case 1:
+ puts("Unexpected MemFault!!\n");
+ abort();
+ default:
+ puts("Unexpected state ");
+ puthex(expect_fault);
+ putc('\n');
+ abort();
+ }
}
static __attribute__((naked))
void mem_entry(void)
{
- asm("mov r0, sp");
- asm("b mem");
+ asm("mov r0, sp");
+ asm("b mem");
}
static inline
void drop_priv(void)
{
- uint32_t val;
- __asm__ ("mrs %0, CONTROL" : "=r"(val) ::);
- val |= 1;
- __asm__ ("msr CONTROL, %0" :: "r"(val) :);
+ uint32_t val;
+ __asm__ ("mrs %0, CONTROL" : "=r"(val) ::);
+ val |= 1;
+ __asm__ ("msr CONTROL, %0" :: "r"(val) :);
}
void svc(void *sp)
{
- int num;
- sp = get_src_stack(sp);
- num = get_svc(sp);
- puts("In SVC ");
- if(num<0) {
- puts("BAD\n");
- abort();
- } else {
- puthex(num);
- putc('\n');
- }
- switch(num) {
- case 1: /* restore privlage */
- {
- uint32_t val;
- __asm__ ("mrs %0, CONTROL" : "=r"(val) ::);
- val &= ~1;
- __asm__ ("msr CONTROL, %0" :: "r"(val) :);
- }
- break;
- case 2:
- abort();
- default:
- puts("Unknown\n");
- abort();
- }
+ int num;
+ sp = get_src_stack(sp);
+ num = get_svc(sp);
+ puts("In SVC ");
+ if(num<0) {
+ puts("BAD\n");
+ abort();
+ } else {
+ puthex(num);
+ putc('\n');
+ }
+ switch(num) {
+ case 1: /* restore privlage */
+ {
+ uint32_t val;
+ __asm__ ("mrs %0, CONTROL" : "=r"(val) ::);
+ val &= ~1;
+ __asm__ ("msr CONTROL, %0" :: "r"(val) :);
+ }
+ break;
+ case 2:
+ abort();
+ default:
+ puts("Unknown\n");
+ abort();
+ }
}
static __attribute__((naked))
void svc_entry(void)
{
- asm("mov r0, sp");
- asm("b svc");
+ asm("mov r0, sp");
+ asm("b svc");
}
void main(void)
{
- run_table.hard = &hard_entry;
- run_table.svc = &svc_entry;
+ run_table.hard = &hard_entry;
+ run_table.svc = &svc_entry;
run_table.mem = &mem_entry;
- asm("cpsid if");
+ asm("cpsid if");
out32(SCB(0xd24), 1<<16); // enable MemFault with SHCSR
- puts("1. In Main\n");
- expect_fault = 1;
+ puts("1. In Main\n");
+ expect_fault = 1;
- /* priority of entries is highest to lowest (0 checked last) */
+ /* priority of entries is highest to lowest (0 checked last) */
set_mpu(0, 0x00000000, (uint32_t)&__end_rom, MPU_NORMAL|MPU_RORO);
set_mpu(1, 0x20000000, 0x00080000, MPU_NORMAL|MPU_RWRW|MPU_XN);
set_mpu(2, 0x4000c000, 0x00001000, MPU_DEVICE|MPU_RWRW|MPU_XN);
set_mpu(3, 0xe000e000, 0x00001000, MPU_DEVICE|MPU_RWRW|MPU_XN);
- /* disable all access to offlimits[] */
- set_mpu(4, (uint32_t)offlimits, sizeof(offlimits),
- MPU_XN|MPU_NORMAL|MPU_NANA);
- /* disable unpriv access to privonly[] */
- set_mpu(5, (uint32_t)privonly, sizeof(privonly),
- MPU_XN|MPU_NORMAL|MPU_RONA);
+ /* disable all access to offlimits[] */
+ set_mpu(4, (uint32_t)offlimits, sizeof(offlimits),
+ MPU_XN|MPU_NORMAL|MPU_NANA);
+ /* disable unpriv access to privonly[] */
+ set_mpu(5, (uint32_t)privonly, sizeof(privonly),
+ MPU_XN|MPU_NORMAL|MPU_RONA);
- puts("2. Access offlimits\n");
- try(offlimits);
- checkfault(1);
+ puts("2. Access offlimits\n");
+ try(offlimits);
+ checkfault(1);
- puts("3. Enable MPU\n");
+ puts("3. Enable MPU\n");
enable_mpu(1,1,0);
- asm("cpsie if");
+ asm("cpsie if");
- expect_fault = 2;
- puts("4. Access offlimits\n");
- try(offlimits);
- checkfault(3);
+ expect_fault = 2;
+ puts("4. Access offlimits\n");
+ try(offlimits);
+ checkfault(3);
- puts("6. In Main\n");
- expect_fault = 1;
+ puts("6. In Main\n");
+ expect_fault = 1;
- puts("7. Access privonly\n");
- try(privonly);
- checkfault(1);
+ puts("7. Access privonly\n");
+ try(privonly);
+ checkfault(1);
- puts("8. drop_priv\n");
- expect_fault = 2;
- drop_priv();
- puts("9. Access privonly\n");
- try(privonly);
+ puts("8. drop_priv\n");
+ expect_fault = 2;
+ drop_priv();
+ puts("9. Access privonly\n");
+ try(privonly);
- puts("11. In Main\n");
- asm("svc 1");
- checkfault(3);
- expect_fault = 1;
+ puts("11. In Main\n");
+ asm("svc 1");
+ checkfault(3);
+ expect_fault = 1;
- puts("12. Access privonly\n");
- try(privonly);
- checkfault(1);
+ puts("12. Access privonly\n");
+ try(privonly);
+ checkfault(1);
- puts("13. In Main\n");
- asm("cpsid i");
+ puts("13. In Main\n");
+ asm("cpsid i");
- puts("14. fault to hardfault\n");
- expect_fault = 10;
- try(offlimits);
- checkfault(11);
+ puts("14. fault to hardfault\n");
+ expect_fault = 10;
+ try(offlimits);
+ checkfault(11);
- puts("15. Enable MPU w/ HFNMIENA\n");
+ puts("15. Enable MPU w/ HFNMIENA\n");
enable_mpu(1,1,1);
- puts("16. fault to hardfault (will escalate to unrecoverable)\n");
- expect_fault = 10;
- try(offlimits);
+ puts("16. fault to hardfault (will escalate to unrecoverable)\n");
+ expect_fault = 10;
+ try(offlimits);
- puts("Shouldn't be here!\n");
+ puts("Shouldn't be here!\n");
}