summaryrefslogtreecommitdiff
path: root/src/arch/arm64/armv8/exception.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/arm64/armv8/exception.c')
-rw-r--r--src/arch/arm64/armv8/exception.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/arch/arm64/armv8/exception.c b/src/arch/arm64/armv8/exception.c
index 8583fd5172..6035d749c7 100644
--- a/src/arch/arm64/armv8/exception.c
+++ b/src/arch/arm64/armv8/exception.c
@@ -51,9 +51,10 @@ static void print_regs(struct exc_state *exc_state)
struct regs *regs = &exc_state->regs;
printk(BIOS_DEBUG, "ELR = 0x%016llx ESR = 0x%08llx\n",
- elx->elr, raw_read_esr_el3());
+ elx->elr, raw_read_esr());
printk(BIOS_DEBUG, "FAR = 0x%016llx SPSR = 0x%08llx\n",
- raw_read_far_el3(), raw_read_spsr_el3());
+ raw_read_far(), raw_read_spsr());
+
for (i = 0; i < 30; i += 2) {
printk(BIOS_DEBUG,
"X%02d = 0x%016llx X%02d = 0x%016llx\n",
@@ -173,7 +174,8 @@ static int test_exception_handler(struct exc_state *state, uint64_t vector_id)
{
/* Update instruction pointer to next instruction. */
state->elx.elr += sizeof(uint32_t);
- raw_write_elr_el3(state->elx.elr);
+ raw_write_elr(state->elx.elr);
+
return EXC_RET_HANDLED;
}