mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-15 00:16:48 +00:00
Code Issues Releases Activity

thermosphere: add proper memory/instruction barriers for breakpoint stuff

Browse source
This commit is contained in:
TuxSH 2020-01-09 22:47:22 +00:00
parent 1eb60a2a52
commit a6d191bf4b
6 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
thermosphere/src/breakpoints.c
View file

@ -49,6 +49,7 @@ static void commitAndBroadcastBreakpointHandler(void *p)
static inline void commitAndBroadcastBreakpoints(void) static inline void commitAndBroadcastBreakpoints(void)
{ {
__dmb_sy();
executeFunctionOnAllCores(commitAndBroadcastBreakpointHandler, NULL, true); executeFunctionOnAllCores(commitAndBroadcastBreakpointHandler, NULL, true);
} }

4
thermosphere/src/breakpoints_watchpoints_load.s
View file

@ -23,6 +23,8 @@
.cfi_startproc .cfi_startproc
loadBreakpointRegs: loadBreakpointRegs:
// x1 = number // x1 = number
dmb sy
adr x16, 1f adr x16, 1f
add x0, x0, #(16 * 8) add x0, x0, #(16 * 8)
mov x4, #(16 * 12) mov x4, #(16 * 12)
@ -51,6 +53,8 @@ loadBreakpointRegs:
.cfi_startproc .cfi_startproc
loadWatchpointRegs: loadWatchpointRegs:
// x1 = number // x1 = number
dmb sy
adr x16, 1f adr x16, 1f
add x0, x0, #(16 * 8) add x0, x0, #(16 * 8)
mov x4, #(16 * 12) mov x4, #(16 * 12)

1
thermosphere/src/single_step.c
View file

@ -56,6 +56,7 @@ void singleStepSetNextState(ExceptionStackFrame *frame, SingleStepState state)
} }
SET_SYSREG(mdscr_el1, mdscr); SET_SYSREG(mdscr_el1, mdscr);
__isb(); // TRM-mandated
} }
void handleSingleStep(ExceptionStackFrame *frame, ExceptionSyndromeRegister esr) void handleSingleStep(ExceptionStackFrame *frame, ExceptionSyndromeRegister esr)

4
thermosphere/src/software_breakpoints.c
View file

@ -74,12 +74,14 @@ static inline bool doApplySoftwareBreakpoint(size_t id)
static void applySoftwareBreakpointHandler(void *p) static void applySoftwareBreakpointHandler(void *p)
{ {
u64 flags = maskIrq(); u64 flags = maskIrq();
__dmb_sy();
doApplySoftwareBreakpoint(*(size_t *)p); doApplySoftwareBreakpoint(*(size_t *)p);
restoreInterruptFlags(flags); restoreInterruptFlags(flags);
} }
static void applySoftwareBreakpoint(size_t id) static void applySoftwareBreakpoint(size_t id)
{ {
__dmb_sy();
executeFunctionOnAllCores(applySoftwareBreakpointHandler, &id, true); executeFunctionOnAllCores(applySoftwareBreakpointHandler, &id, true);
} }
@ -101,12 +103,14 @@ static inline bool doRevertSoftwareBreakpoint(size_t id)
static void revertSoftwareBreakpointHandler(void *p) static void revertSoftwareBreakpointHandler(void *p)
{ {
u64 flags = maskIrq(); u64 flags = maskIrq();
__dmb_sy();
doRevertSoftwareBreakpoint(*(size_t *)p); doRevertSoftwareBreakpoint(*(size_t *)p);
restoreInterruptFlags(flags); restoreInterruptFlags(flags);
} }
static void revertSoftwareBreakpoint(size_t id) static void revertSoftwareBreakpoint(size_t id)
{ {
__dmb_sy();
executeFunctionOnAllCores(revertSoftwareBreakpointHandler, &id, true); executeFunctionOnAllCores(revertSoftwareBreakpointHandler, &id, true);
} }

5
thermosphere/src/utils.h
View file

@ -56,6 +56,11 @@ static inline u##sz __##op##sz(u##sz n)\
_DECLARE_ASM_ARITHMETIC_UNARY_HELPER64(rbit) _DECLARE_ASM_ARITHMETIC_UNARY_HELPER64(rbit)
_DECLARE_ASM_ARITHMETIC_UNARY_HELPER32(rbit) _DECLARE_ASM_ARITHMETIC_UNARY_HELPER32(rbit)
static inline void __dmb_sy(void)
{
__asm__ __volatile__ ("dmb sy" ::: "memory");
}
static inline void __dsb_sy(void) static inline void __dsb_sy(void)
{ {
__asm__ __volatile__ ("dsb sy" ::: "memory"); __asm__ __volatile__ ("dsb sy" ::: "memory");

1
thermosphere/src/watchpoints.c
View file

@ -56,6 +56,7 @@ static void commitAndBroadcastWatchpointHandler(void *p)
static inline void commitAndBroadcastWatchpoints(void) static inline void commitAndBroadcastWatchpoints(void)
{ {
__dmb_sy();
executeFunctionOnAllCores(commitAndBroadcastWatchpointHandler, NULL, true); executeFunctionOnAllCores(commitAndBroadcastWatchpointHandler, NULL, true);
} }