diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2022-10-22 16:13:55 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2022-10-22 16:13:55 +0200 |
| commit | bf6e74ad8eb26d30de5654b7ab021a18061346b1 (patch) | |
| tree | d77dc9cedeb3bb606eefee9eb4e5fcadb93296e2 /src/dynarec | |
| parent | c2253dafc09b9651a263e19f5f656564f18df633 (diff) | |
| download | box64-bf6e74ad8eb26d30de5654b7ab021a18061346b1.tar.gz box64-bf6e74ad8eb26d30de5654b7ab021a18061346b1.zip | |
[DYNAREC] Added BOX64_DYNAREC_SAFEFLAGS
Diffstat (limited to 'src/dynarec')
| -rwxr-xr-x | src/dynarec/arm64/dynarec_arm64_00.c | 13 | ||||
| -rw-r--r-- | src/dynarec/arm64/dynarec_arm64_64.c | 3 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/dynarec/arm64/dynarec_arm64_00.c b/src/dynarec/arm64/dynarec_arm64_00.c index 4cdb7bea..59c70674 100755 --- a/src/dynarec/arm64/dynarec_arm64_00.c +++ b/src/dynarec/arm64/dynarec_arm64_00.c @@ -1565,7 +1565,9 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin case 0xC2: INST_NAME("RETN"); //SETFLAGS(X_ALL, SF_SET); // Hack, set all flags (to an unknown state...) - READFLAGS(X_PEND); // lets play safe here too + if(box64_dynarec_safeflags) { + READFLAGS(X_PEND); // lets play safe here too + } BARRIER(BARRIER_FLOAT); i32 = F16; retn_to_epilog(dyn, ninst, i32); @@ -1575,7 +1577,9 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin case 0xC3: INST_NAME("RET"); // SETFLAGS(X_ALL, SF_SET); // Hack, set all flags (to an unknown state...) - READFLAGS(X_PEND); // so instead, force the defered flags, so it's not too slow, and flags are not lost + if(box64_dynarec_safeflags) { + READFLAGS(X_PEND); // so instead, force the defered flags, so it's not too slow, and flags are not lost + } BARRIER(BARRIER_FLOAT); ret_to_epilog(dyn, ninst); *need_epilog = 0; @@ -2134,7 +2138,7 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin } break; default: - if(ninst && dyn->insts[ninst-1].x64.set_flags) { + if((box64_dynarec_safeflags>1) || (ninst && dyn->insts[ninst-1].x64.set_flags)) { READFLAGS(X_PEND); // that's suspicious } else { SETFLAGS(X_ALL, SF_SET); // Hack to set flags to "dont'care" state @@ -2464,7 +2468,8 @@ uintptr_t dynarec64_00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin break; case 2: // CALL Ed INST_NAME("CALL Ed"); - PASS2IF(((ninst && dyn->insts[ninst-1].x64.set_flags) + PASS2IF((box64_dynarec_safeflags>1) || + ((ninst && dyn->insts[ninst-1].x64.set_flags) || ((ninst>1) && dyn->insts[ninst-2].x64.set_flags)), 1) { READFLAGS(X_PEND); // that's suspicious diff --git a/src/dynarec/arm64/dynarec_arm64_64.c b/src/dynarec/arm64/dynarec_arm64_64.c index 81e746c1..ff735cff 100644 --- a/src/dynarec/arm64/dynarec_arm64_64.c +++ b/src/dynarec/arm64/dynarec_arm64_64.c @@ -947,7 +947,8 @@ uintptr_t dynarec64_64(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin break; case 2: // CALL Ed INST_NAME("CALL Ed"); - PASS2IF(((ninst && dyn->insts[ninst-1].x64.set_flags) + PASS2IF((box64_dynarec_safeflags>1) || + ((ninst && dyn->insts[ninst-1].x64.set_flags) || ((ninst>1) && dyn->insts[ninst-2].x64.set_flags)), 1) { READFLAGS(X_PEND); // that's suspicious |