thermosphere: use ish instead of sy in most places

This commit is contained in:
TuxSH 2020-01-19 18:18:48 +00:00
parent d1cd17a9df
commit 3ca3e094fe
2 changed files with 10 additions and 10 deletions

View file

@ -19,7 +19,7 @@
// Precondition: x1 <= 16 // Precondition: x1 <= 16
FUNCTION loadBreakpointRegs FUNCTION loadBreakpointRegs
// x1 = number // x1 = number
dmb sy dmb ish
adr x16, 1f adr x16, 1f
add x0, x0, #(16 * 8) add x0, x0, #(16 * 8)
@ -35,7 +35,7 @@ FUNCTION loadBreakpointRegs
msr dbgbcr\count\()_el1, x2 msr dbgbcr\count\()_el1, x2
msr dbgbvr\count\()_el1, x3 msr dbgbvr\count\()_el1, x3
.endr .endr
dsb sy dsb ish
isb isb
ret ret
END_FUNCTION END_FUNCTION
@ -43,7 +43,7 @@ END_FUNCTION
// Precondition: x1 <= 16 // Precondition: x1 <= 16
FUNCTION loadWatchpointRegs FUNCTION loadWatchpointRegs
// x1 = number // x1 = number
dmb sy dmb ish
adr x16, 1f adr x16, 1f
add x0, x0, #(16 * 8) add x0, x0, #(16 * 8)
@ -59,7 +59,7 @@ FUNCTION loadWatchpointRegs
msr dbgwcr\count\()_el1, x2 msr dbgwcr\count\()_el1, x2
msr dbgwvr\count\()_el1, x3 msr dbgwvr\count\()_el1, x3
.endr .endr
dsb sy dsb ish
isb isb
ret ret
END_FUNCTION END_FUNCTION

View file

@ -36,23 +36,23 @@
.endm .endm
FUNCTION fpuLoadRegistersFromStorage FUNCTION fpuLoadRegistersFromStorage
dmb sy dmb ish
LDSTORE_QREGS ldp LDSTORE_QREGS ldp
ldp x1, x2, [x0] ldp x1, x2, [x0]
msr fpsr, x1 msr fpsr, x1
msr fpcr, x2 msr fpcr, x2
dsb sy dsb ish
isb sy isb ish
ret ret
END_FUNCTION END_FUNCTION
FUNCTION fpuStoreRegistersToStorage FUNCTION fpuStoreRegistersToStorage
dsb sy dsb ish
isb sy isb ish
LDSTORE_QREGS stp LDSTORE_QREGS stp
mrs x1, fpsr mrs x1, fpsr
mrs x2, fpcr mrs x2, fpcr
stp x1, x2, [x0] stp x1, x2, [x0]
dmb sy dmb ish
ret ret
END_FUNCTION END_FUNCTION