GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: ARM: Keep track of the CPSR when exceptions happen. 

Use the SPSR to extract and inject CPSR values when an exception happens and
pass that information to exception hooks.

The register structure GDB expects when using its remote protocol has a spot
for the CPSR.

BUG=None
TEST=Built and booted on link, nyan.
BRANCH=None

Original-Change-Id: Id950fb09d72fb0f81e4eef2489c0849ce5dd8aca
Original-Signed-off-by: Gabe Black <gabeblack@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/180253
Original-Reviewed-by: Gabe Black <gabeblack@chromium.org>
Original-Tested-by: Gabe Black <gabeblack@chromium.org>
Original-Commit-Queue: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 8e7014f24a580f84c91fa7b0369dfa922918adcc)
Signed-off-by: Marc Jones <marc.jones@se-eng.com>

Change-Id: I49357fb6a65edeff7a9a48d54254308a6b0efdb7
Reviewed-on: http://review.coreboot.org/7657
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Gabe Black 2013-12-16 04:07:50 -08:00 committed by Marc Jones
parent 20cdb2439f
commit 97345dbc6c
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
payloads/libpayload/arch/arm/exception.c
View File

@ -66,7 +66,7 @@ static void dump_stack(uintptr_t addr, size_t bytes)
} }
} }
static void print_regs(uint32_t *regs) static void print_regs(struct exception_state *state)
{ {
int i; int i;
@ -81,8 +81,9 @@ static void print_regs(uint32_t *regs)
printf("IP"); printf("IP");
else else
printf("R%d", i); printf("R%d", i);
printf(" = 0x%08x\n", regs[i]); printf(" = 0x%08x\n", state->regs[i]);
} }
printf("CPSR = 0x%08x\n", state->cpsr);
} }
void exception_dispatch(struct exception_state *state, int idx); void exception_dispatch(struct exception_state *state, int idx);
@ -102,7 +103,7 @@ void exception_dispatch(struct exception_state *state, int idx)
else else
printf("exception _not_used.\n"); printf("exception _not_used.\n");
} }
print_regs(state->regs); print_regs(state);
dump_stack(state->regs[13], 512); dump_stack(state->regs[13], 512);
halt(); halt();
} }

4
payloads/libpayload/arch/arm/exception_asm.S
View File

@ -74,9 +74,13 @@ exception_common:
stmfd sp, { sp, lr }^ stmfd sp, { sp, lr }^
sub sp, sp, $8 sub sp, sp, $8
push { r0 - r12 } push { r0 - r12 }
mrs r0, SPSR
push { r0 }
mov r0, sp mov r0, sp
ldr r1, exception_idx ldr r1, exception_idx
blx exception_dispatch blx exception_dispatch
pop { r0 }
msr SPSR_cxsf, r0
pop { r0 - r12 } pop { r0 - r12 }
add sp, sp, $8 add sp, sp, $8
ldmfd sp!, { pc }^ ldmfd sp!, { pc }^

1
payloads/libpayload/include/arm/arch/exception.h
View File

@ -36,6 +36,7 @@ void set_vbar(uint32_t vbar);
struct exception_state struct exception_state
{ {
uint32_t cpsr;
uint32_t regs[16]; uint32_t regs[16];
} __attribute__((packed)); } __attribute__((packed));