diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2025-07-23 11:13:28 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2025-07-23 11:13:37 +0200 |
| commit | 49cc5eabcbcebdd6a67bfa32a82caf1723997d78 (patch) | |
| tree | 18789911b978ca0fa85a336f75cff117903c8a3f /src/dynarec/arm64 | |
| parent | bf429a1dcfdaa960857f03a6f85e0dbf83e8b1e4 (diff) | |
| download | box64-49cc5eabcbcebdd6a67bfa32a82caf1723997d78.tar.gz box64-49cc5eabcbcebdd6a67bfa32a82caf1723997d78.zip | |
Some handling of case where signal numbers differs between native and x64 archs (not complete, missing sigset conversions)
Diffstat (limited to 'src/dynarec/arm64')
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_00.c | 5 | ||||
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_functions.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dynarec/arm64/dynarec_arm64_00.c b/src/dynarec/arm64/dynarec_arm64_00.c index eac955a7..a547f2a1 100644 --- a/src/dynarec/arm64/dynarec_arm64_00.c +++ b/src/dynarec/arm64/dynarec_arm64_00.c @@ -3,6 +3,7 @@ #include <stddef.h> #include <errno.h> +#include "x64_signals.h" #include "os.h" #include "debug.h" #include "box64context.h" @@ -2626,9 +2627,9 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin if(!BOX64ENV(ignoreint3)) { // check if TRAP signal is handled TABLE64C(x1, const_context); - MOV32w(x2, offsetof(box64context_t, signals[SIGTRAP])); + MOV32w(x2, offsetof(box64context_t, signals[X64_SIGTRAP])); LDRx_REG(x3, x1, x2); - //LDRx_U12(x3, x1, offsetof(box64context_t, signals[SIGTRAP])); + //LDRx_U12(x3, x1, offsetof(box64context_t, signals[X64_SIGTRAP])); CMPSx_U12(x3, 0); B_MARK(cEQ); GETIP(addr); // update RIP diff --git a/src/dynarec/arm64/dynarec_arm64_functions.c b/src/dynarec/arm64/dynarec_arm64_functions.c index 84832f65..15c0f3f0 100644 --- a/src/dynarec/arm64/dynarec_arm64_functions.c +++ b/src/dynarec/arm64/dynarec_arm64_functions.c @@ -4,7 +4,6 @@ #include <errno.h> #include <string.h> #include <math.h> -#include <signal.h> #include <sys/types.h> #include <unistd.h> |