diff options
| author | Yang Liu <liuyang22@iscas.ac.cn> | 2024-08-10 16:51:56 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-10 10:51:56 +0200 |
| commit | 7db74b84cf396987f720ca08932950e8ea46aa68 (patch) | |
| tree | 17c495935c3b1cc2873d5fbfbf5658f33321e98f | |
| parent | 4c0a25db2aa58a3d69a84cff9d4e701c8fcd32d3 (diff) | |
| download | box64-7db74b84cf396987f720ca08932950e8ea46aa68.tar.gz box64-7db74b84cf396987f720ca08932950e8ea46aa68.zip | |
[RV64_DYNAREC] Fixed flags for shrd/shld with constant 0 shift (#1730)
| -rw-r--r-- | src/dynarec/rv64/dynarec_rv64_0f.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/src/dynarec/rv64/dynarec_rv64_0f.c b/src/dynarec/rv64/dynarec_rv64_0f.c index cfcc48d4..37637326 100644 --- a/src/dynarec/rv64/dynarec_rv64_0f.c +++ b/src/dynarec/rv64/dynarec_rv64_0f.c @@ -1740,12 +1740,17 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni case 0xA4: nextop = F8; INST_NAME("SHLD Ed, Gd, Ib"); - SETFLAGS(X_ALL, SF_SET_PENDING); - GETED(1); - GETGD; - u8 = F8; - emit_shld32c(dyn, ninst, rex, ed, gd, u8, x3, x4); - WBACK; + if (geted_ib(dyn, addr, ninst, nextop)) { + SETFLAGS(X_ALL, SF_SET_PENDING); + GETED(1); + GETGD; + u8 = F8; + emit_shld32c(dyn, ninst, rex, ed, gd, u8, x3, x4); + WBACK; + } else { + FAKEED; + F8; + } break; case 0xA5: nextop = F8; @@ -1796,13 +1801,18 @@ uintptr_t dynarec64_0F(dynarec_rv64_t* dyn, uintptr_t addr, uintptr_t ip, int ni case 0xAC: nextop = F8; INST_NAME("SHRD Ed, Gd, Ib"); - SETFLAGS(X_ALL, SF_SET_PENDING); - GETED(1); - GETGD; - u8 = F8; - u8 &= (rex.w ? 0x3f : 0x1f); - emit_shrd32c(dyn, ninst, rex, ed, gd, u8, x3, x4); - WBACK; + if (geted_ib(dyn, addr, ninst, nextop)) { + SETFLAGS(X_ALL, SF_SET_PENDING); + GETED(1); + GETGD; + u8 = F8; + u8 &= (rex.w ? 0x3f : 0x1f); + emit_shrd32c(dyn, ninst, rex, ed, gd, u8, x3, x4); + WBACK; + } else { + FAKEED; + F8; + } break; case 0xAD: nextop = F8; |