i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm64: Save all integer registers in exception handlers.

Browse Source 
* This is needed in order to support syscalls and other exceptions
  that need to be able to inspect/modify userspace register contents.

Change-Id: I8a638c0c40dd44ed882adad0591ae3bf5493a6b9
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8329
Haiku-Format: Haiku-format Bot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
Owen Anderson
2024-09-18 19:34:15 +00:00
committed by Fredrik Holmqvist
parent 0f807f4401
commit c2f3786ab0
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/arm64/arch_cpu.h
+2 -2
View File
@@ -132,10 +132,10 @@ struct iframe {
// return info // return info
uint64 elr; uint64 elr;
uint64 spsr; uint64 spsr;
uint64 x[20]; uint64 x[29];
uint64 fp;
uint64 lr; uint64 lr;
uint64 sp; uint64 sp;
uint64 fp;
// exception info // exception info
uint64 esr; uint64 esr;
src/system/kernel/arch/arm64/arch_asm.S
+10 -6
View File
@@ -40,11 +40,11 @@ sub sp, sp, \xt
stp x16, x17, [x19, #(IFRAME_x + 16 * 8)] stp x16, x17, [x19, #(IFRAME_x + 16 * 8)]
mov x0, sp // original x19 that we swapped with sp mov x0, sp // original x19 that we swapped with sp
stp x18, x0, [x19, #(IFRAME_x + 18 * 8)] stp x18, x0, [x19, #(IFRAME_x + 18 * 8)]
stp x20, x21, [x19, #(IFRAME_x + 20 * 8)]
// x20-x28 won't be clobbered stp x22, x23, [x19, #(IFRAME_x + 22 * 8)]
// thus we don't really need to store these stp x24, x25, [x19, #(IFRAME_x + 24 * 8)]
stp x26, x27, [x19, #(IFRAME_x + 26 * 8)]
str x29, [x19, #(IFRAME_fp)] stp x28, fp, [x19, #(IFRAME_x + 28 * 8)]
str x30, [x19, #(IFRAME_lr)] str x30, [x19, #(IFRAME_lr)]
.if \el == 0 .if \el == 0
@@ -84,7 +84,11 @@ sub sp, sp, \xt
ldp x14, x15, [x19, #(IFRAME_x + 14 * 8)] ldp x14, x15, [x19, #(IFRAME_x + 14 * 8)]
ldp x16, x17, [x19, #(IFRAME_x + 16 * 8)] ldp x16, x17, [x19, #(IFRAME_x + 16 * 8)]
// x18 and x19 will be restored later // x18 and x19 will be restored later
ldr x29, [x19, #(IFRAME_fp)] ldp x20, x21, [x19, #(IFRAME_x + 20 * 8)]
ldp x22, x23, [x19, #(IFRAME_x + 22 * 8)]
ldp x24, x25, [x19, #(IFRAME_x + 24 * 8)]
ldp x26, x27, [x19, #(IFRAME_x + 26 * 8)]
ldp x28, fp, [x19, #(IFRAME_x + 28 * 8)]
ldr x30, [x19, #(IFRAME_lr)] ldr x30, [x19, #(IFRAME_lr)]
// disable interrupts before restoring ELR/SPSR/sp // disable interrupts before restoring ELR/SPSR/sp
src/system/kernel/arch/arm64/asm_offsets.cpp
+5
View File
@@ -44,3 +44,8 @@ dummy()
DEFINE_OFFSET_MACRO(CPU_ENT, cpu_ent, fault_handler); DEFINE_OFFSET_MACRO(CPU_ENT, cpu_ent, fault_handler);
DEFINE_OFFSET_MACRO(CPU_ENT, cpu_ent, fault_handler_stack_pointer); DEFINE_OFFSET_MACRO(CPU_ENT, cpu_ent, fault_handler_stack_pointer);
} }
// fp must be located at x[29] so that we can load/store
// x[28] and fp with a single LDP/STP instruction.
STATIC_ASSERT(offsetof(iframe, fp) == offsetof(iframe, x) + 29 * 8);