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

RISC-V: Make inline asm usage safer 

Change-Id: Id547c98e876e9fd64fa4d12239a2608bfd2495d2
Signed-off-by: Andrew Waterman <aswaterman@gmail.com>
Reviewed-on: https://review.coreboot.org/13735
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Andrew Waterman 2016-02-18 16:06:21 -08:00 committed by Ronald G. Minnich
parent deba4e8560
commit f16d904192
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/arch/riscv/trap_handler.c
View File

@ -84,20 +84,18 @@ void handle_supervisor_call(trapframe *tf) {
void trap_handler(trapframe *tf) { void trap_handler(trapframe *tf) {
write_csr(mscratch, tf); write_csr(mscratch, tf);
int cause = 0; uintptr_t cause;
void* epc = 0; void *epc;
void* badAddr = 0; void *badAddr;
// extract cause // extract cause
asm("csrr t0, mcause"); asm("csrr %0, mcause" : "=r"(cause));
asm("move %0, t0" : "=r"(cause));
// extract faulting Instruction pc // extract faulting Instruction pc
epc = (void*) tf->epc; epc = (void*) tf->epc;
// extract bad address // extract bad address
asm("csrr t0, mbadaddr"); asm("csrr %0, mbadaddr" : "=r"(badAddr));
asm("move %0, t0" : "=r"(badAddr));
switch(cause) { switch(cause) {
case 0: case 0: