Skip to content

hal/armvXm: use cpu_context_t as exc_context_t #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
etiaro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

hal/armvXm: use cpu_context_t as exc_context_t #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7132ce3
hal/armv7m: change exc_context_t into cpu_context_t
etiaro Aug 12, 2025
c076305
hal/armv8m: change exc_context_t into cpu_context_t
etiaro Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions hal/armv7m/arch/exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@
#define SIZE_CTXDUMP 320 /* Size of dumped context */


typedef struct _exc_context_t {
/* Saved by ISR */
u32 psp;
u32 r4;
u32 r5;
u32 r6;
u32 r7;
u32 r8;
u32 r9;
u32 r10;
u32 r11;
u32 excret;

/* Saved by hardware */
cpu_hwContext_t mspctx;
} exc_context_t;
typedef cpu_context_t exc_context_t;

#endif
21 changes: 8 additions & 13 deletions hal/armv7m/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "hal/string.h"
#include "config.h"

#define SIZE_FPUCTX (16 * sizeof(u32))
#define SIZE_FPUCTX (18 * sizeof(u32))

static struct {
void (*handler)(unsigned int, exc_context_t *);
Expand All @@ -40,24 +40,19 @@ void hal_exceptionsDumpContext(char *buff, exc_context_t *ctx, int n)
"12 #Debug", "13 #", "14 #PendSV", "15 #SysTick"
};
size_t i = 0;
u32 msp = (u32)ctx + sizeof(*ctx);
u32 psp = ctx->psp;
cpu_hwContext_t *hwctx;

/* If we came from userspace HW ctx in on psp stack */
if (ctx->excret == RET_THREAD_PSP) {
if (ctx->irq_ret == RET_THREAD_PSP) {
hwctx = (void *)ctx->psp;
msp -= sizeof(cpu_hwContext_t);
psp += sizeof(cpu_hwContext_t);
#ifdef CPU_IMXRT /* FIXME - check if FPU was enabled instead */
psp += SIZE_FPUCTX;
#endif
}
else {
hwctx = &ctx->mspctx;
#ifdef CPU_IMXRT
msp += SIZE_FPUCTX;
#endif
hwctx = &ctx->hwctx;
}

n &= 0xf;
Expand Down Expand Up @@ -88,8 +83,8 @@ void hal_exceptionsDumpContext(char *buff, exc_context_t *ctx, int n)
i += hal_i2s(" pc=", &buff[i], hwctx->pc, 16, 1);

i += hal_i2s("\npsp=", &buff[i], psp, 16, 1);
i += hal_i2s(" msp=", &buff[i], msp, 16, 1);
i += hal_i2s(" exr=", &buff[i], ctx->excret, 16, 1);
i += hal_i2s(" msp=", &buff[i], ctx->msp, 16, 1);
i += hal_i2s(" exr=", &buff[i], ctx->irq_ret, 16, 1);
i += hal_i2s(" bfa=", &buff[i], *(u32 *)0xe000ed38, 16, 1);

i += hal_i2s("\ncfs=", &buff[i], *(u32 *)0xe000ed28, 16, 1);
Expand Down Expand Up @@ -123,7 +118,7 @@ __attribute__((noreturn)) static void exceptions_fatal(unsigned int n, exc_conte
void exceptions_dispatch(unsigned int n, exc_context_t *ctx)
{
if ((hal_exception_common.handler != NULL) &&
((ctx->excret & (1 << 2)) != 0)) {
((ctx->irq_ret & (1 << 2)) != 0)) {

/* Need to enter the kernel by returning to the
* thread mode. Otherwise we won't be able to
Expand All @@ -142,11 +137,11 @@ ptr_t hal_exceptionsPC(exc_context_t *ctx)
{
cpu_hwContext_t *hwctx;

if (ctx->excret == RET_THREAD_PSP) {
if (ctx->irq_ret == RET_THREAD_PSP) {
hwctx = (void *)ctx->psp;
}
else {
hwctx = &ctx->mspctx;
hwctx = &ctx->hwctx;
}

return hwctx->pc;
Expand Down
17 changes: 14 additions & 3 deletions hal/armv7m/imxrt/_init.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,23 @@ _syscallend:

_exceptions_dispatch:
cpsid if
isb

mrs r0, psp
stmdb sp!, {r0, r4-r11, lr}
mov r0, sp /* save MSP to be stored in cpu_context_t */
tst lr, #(1 << 2)
ite ne
subne sp, sp, #((8 + 18) * 4) /* If coming from userspace, make room on the stack for hardware-stored context */
addeq r0, r0, #((8 + 18) * 4) /* If coming from kernel, calculate msp as it was before the exception */

vstmdb sp!, {s16-s31}
str r0, [sp, #-8]! /* Store msp, skip over pad0 */

mrs r0, ipsr
mov r1, sp
mrs r3, psp
sub r1, sp, #48
ldr r2, =0xe000ef38
ldr r2, [r2]
stmdb sp!, {r1-r11, lr}

b exceptions_dispatch
.size _exceptions_dispatch, .-_exceptions_dispatch
Expand Down
14 changes: 11 additions & 3 deletions hal/armv7m/stm32/_init.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,12 +171,20 @@ _syscallend:

_exceptions_dispatch:
cpsid if
isb

mrs r0, psp
stmdb sp!, {r0, r4-r11, lr}
mov r0, sp /* save MSP to be stored in cpu_context_t */
tst lr, #(1 << 2)
ite ne
subne sp, sp, #(8 * 4) /* If coming from userspace, make room on the stack for hardware-stored context */
addeq r0, r0, #(8 * 4) /* If coming from kernel, calculate msp as it was before the exception */

str r0, [sp, #-8]! /* Store msp, skip over pad0 */

mrs r0, ipsr
mov r1, sp
mrs r3, psp
sub r1, sp, #48
Comment thread
etiaro marked this conversation as resolved.
stmdb sp!, {r1-r11, lr}

b exceptions_dispatch
.size _exceptions_dispatch, .-_exceptions_dispatch
Expand Down
17 changes: 1 addition & 16 deletions hal/armv8m/arch/exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,6 @@
#define SIZE_CTXDUMP 512 /* Size of dumped context */


typedef struct _exc_context_t {
/* Saved by ISR */
u32 psp;
u32 r4;
u32 r5;
u32 r6;
u32 r7;
u32 r8;
u32 r9;
u32 r10;
u32 r11;
u32 excret;

/* Saved by hardware */
cpu_hwContext_t mspctx;
} exc_context_t;
typedef cpu_context_t exc_context_t;

#endif
17 changes: 7 additions & 10 deletions hal/armv8m/exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,18 @@ void hal_exceptionsDumpContext(char *buff, exc_context_t *ctx, int n)
"12 #Debug", "13 #", "14 #PendSV", "15 #SysTick"
};
size_t i = 0;
u32 msp = (u32)ctx + sizeof(*ctx);
const u32 fpu_hwctx_size = ((ctx->excret & EXC_RETURN_FTYPE) == 0) ? SIZE_FPUCTX : 0;
const u32 fpu_hwctx_size = ((ctx->irq_ret & EXC_RETURN_FTYPE) == 0) ? SIZE_FPUCTX : 0;
u32 psp = ctx->psp;
u32 cfsr, far;
cpu_hwContext_t *hwctx;

/* If we came from userspace HW ctx in on psp stack (according to EXC_RETURN) */
if ((ctx->excret & EXC_RETURN_SPSEL) != 0) {
if ((ctx->irq_ret & EXC_RETURN_SPSEL) != 0) {
hwctx = (void *)ctx->psp;
msp -= sizeof(cpu_hwContext_t);
psp += sizeof(cpu_hwContext_t) + fpu_hwctx_size;
}
else {
hwctx = &ctx->mspctx;
msp += fpu_hwctx_size;
hwctx = &ctx->hwctx;
}

n &= 0xf;
Expand Down Expand Up @@ -94,8 +91,8 @@ void hal_exceptionsDumpContext(char *buff, exc_context_t *ctx, int n)
i += hal_i2s(" pc=", &buff[i], hwctx->pc, 16, 1);

i += hal_i2s("\npsp=", &buff[i], psp, 16, 1);
i += hal_i2s(" msp=", &buff[i], msp, 16, 1);
i += hal_i2s(" exr=", &buff[i], ctx->excret, 16, 1);
i += hal_i2s(" msp=", &buff[i], ctx->msp, 16, 1);
i += hal_i2s(" exr=", &buff[i], ctx->irq_ret, 16, 1);

if (n == exc_BusFault) {
cfsr = (*CFSR >> 8) & 0xff;
Expand Down Expand Up @@ -147,11 +144,11 @@ ptr_t hal_exceptionsPC(exc_context_t *ctx)
{
cpu_hwContext_t *hwctx;

if ((ctx->excret & EXC_RETURN_SPSEL) != 0) {
if ((ctx->irq_ret & EXC_RETURN_SPSEL) != 0) {
hwctx = (void *)ctx->psp;
}
else {
hwctx = &ctx->mspctx;
hwctx = &ctx->hwctx;
}

return hwctx->pc;
Expand Down
13 changes: 10 additions & 3 deletions hal/armv8m/mcx/_init.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,18 @@ _exceptions_dispatch:
cpsid if
isb

mrs r0, psp
stmdb sp!, {r0, r4-r11, lr}
mov r0, sp /* save MSP to be stored in cpu_context_t */
tst lr, #(1 << 2)
ite ne
subne sp, sp, #(8 * 4) /* If coming from userspace, make room on the stack for hardware-stored context */
addeq r0, r0, #(8 * 4) /* If coming from kernel, calculate msp as it was before the exception */

str r0, [sp, #-8]! /* Store msp, skip over pad0 */

mrs r0, ipsr
mov r1, sp
mrs r3, psp
sub r1, sp, #48
Comment thread
etiaro marked this conversation as resolved.
stmdb sp!, {r1-r11, lr}

b exceptions_dispatch
.size _exceptions_dispatch, .-_exceptions_dispatch
Expand Down
15 changes: 11 additions & 4 deletions hal/armv8m/nrf/_init.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,18 @@ _exceptions_dispatch:
cpsid if
isb

mrs r0, psp
stmdb sp!, {r0, r4-r11, lr}
mov r0, sp /* save MSP to be stored in cpu_context_t */
tst lr, #(1 << 2)
ite ne
subne sp, sp, #(8 * 4) /* If coming from userspace, make room on the stack for hardware-stored context */
addeq r0, r0, #(8 * 4) /* If coming from kernel, calculate msp as it was before the exception */

str r0, [sp, #-8]! /* Store msp, skip over pad0 */

mrs r0, ipsr
mov r1, sp
mrs r3, psp
sub r1, sp, #48
Comment thread
etiaro marked this conversation as resolved.
stmdb sp!, {r1-r11, lr}

b exceptions_dispatch
.size _exceptions_dispatch, .-_exceptions_dispatch
Expand Down Expand Up @@ -357,4 +364,4 @@ hal_exceptionJump:
bx lr

.size hal_exceptionJump, .-hal_exceptionJump
.ltorg
.ltorg
27 changes: 23 additions & 4 deletions hal/armv8m/stm32/_init.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,31 @@ _exceptions_dispatch:
cpsid if
isb

mrs r0, psp
/* push psp, r4~r11, excret */
stmdb sp!, {r0, r4-r11, lr}
mov r0, sp /* save MSP to be stored in cpu_context_t */
tst lr, #EXC_RETURN_SPSEL
itt ne
subne sp, sp, #(8 * 4) /* If coming from userspace, make room on the stack for hardware-stored context */
bne 1f

tst lr, #EXC_RETURN_FTYPE /* If coming from kernel, calculate msp as it was before the exception */
ite ne
addne r0, r0, #(8 * 4)
addeq r0, r0, #((8 + 18) * 4)

1:
#if KERNEL_FPU_SUPPORT
vpush {s16-s31}
#endif
str r0, [sp, #-8]! /* Store msp, skip over pad0 */

mrs r0, ipsr
mov r1, sp
sub r1, sp, #(12 * 4) /* pointer to cpu_context_t on stack */
#if KERNEL_FPU_SUPPORT
ldr r2, =SCS_BASE
ldr r2, [r2, #SCS_FPCAR]
#endif
mrs r3, psp
push {r1-r11, lr} /* store savesp, fpuctx, psp, r4~r11, irq_ret */

/* void exceptions_dispatch(unsigned int n, exc_context_t *ctx) */
b exceptions_dispatch
Expand Down
Loading