diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2023-10-11 12:01:21 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2023-10-11 12:01:21 +0200 |
| commit | 3e18d5ea57c5da660e28acf08127d46336d4d0a0 (patch) | |
| tree | b9adbe3efb2b9e8854544eae54561bcbd91bca00 | |
| parent | ae75a502f0601b5e4614edecea9901b44c17ca6f (diff) | |
| download | box64-3e18d5ea57c5da660e28acf08127d46336d4d0a0.tar.gz box64-3e18d5ea57c5da660e28acf08127d46336d4d0a0.zip | |
[ARM64_DYNAREC] Better place for memory barrier on jmp_next and iret_to_epilog
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dynarec/arm64/dynarec_arm64_helper.c b/src/dynarec/arm64/dynarec_arm64_helper.c index e0450547..d7474686 100644 --- a/src/dynarec/arm64/dynarec_arm64_helper.c +++ b/src/dynarec/arm64/dynarec_arm64_helper.c @@ -567,6 +567,7 @@ void jump_to_next(dynarec_arm_t* dyn, uintptr_t ip, int reg, int ninst) MAYUSE(dyn); MAYUSE(ninst); MESSAGE(LOG_DUMP, "Jump to next\n"); + SMEND(); if(reg) { if(reg!=xRIP) { MOVx_REG(xRIP, reg); @@ -602,7 +603,6 @@ void jump_to_next(dynarec_arm_t* dyn, uintptr_t ip, int reg, int ninst) #ifdef HAVE_TRACE //MOVx(x3, 15); no access to PC reg #endif - SMEND(); BLR(x2); // save LR... } @@ -689,6 +689,7 @@ void iret_to_epilog(dynarec_arm_t* dyn, int ninst, int is64bits) //#warning TODO: is64bits MAYUSE(ninst); MESSAGE(LOG_DUMP, "IRet to epilog\n"); + SMEND(); // POP IP NOTEST(x2); if(is64bits) { @@ -723,7 +724,6 @@ void iret_to_epilog(dynarec_arm_t* dyn, int ninst, int is64bits) MOVx_REG(xRSP, x3); // Ret.... MOV64x(x2, (uintptr_t)arm64_epilog); // epilog on purpose, CS might have changed! - SMEND(); BR(x2); CLEARIP(); } |