diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2021-04-09 17:21:53 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2021-04-09 17:21:53 +0200 |
| commit | a0a0bc8270d549c45cc52973d59063e200925bde (patch) | |
| tree | 60d78e23176589b0e66aa489b2cd8bcbb3b1bf6d /src | |
| parent | 25c532610b748f0bd59878242b4cdccebd6dbf1e (diff) | |
| download | box64-a0a0bc8270d549c45cc52973d59063e200925bde.tar.gz box64-a0a0bc8270d549c45cc52973d59063e200925bde.zip | |
Added F0 87 opcode ([DYNAREC] too)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dynarec/dynarec_arm64_f0.c | 27 | ||||
| -rw-r--r-- | src/emu/x64runf0.c | 45 |
2 files changed, 71 insertions, 1 deletions
diff --git a/src/dynarec/dynarec_arm64_f0.c b/src/dynarec/dynarec_arm64_f0.c index aa5f3f96..620a03a7 100644 --- a/src/dynarec/dynarec_arm64_f0.c +++ b/src/dynarec/dynarec_arm64_f0.c @@ -409,6 +409,33 @@ uintptr_t dynarec64_F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nin } break; + case 0x87: + INST_NAME("LOCK XCHG Ed, Gd"); + nextop = F8; + if(MODREG) { + GETGD; + GETED(0); + MOVxw_REG(x1, gd); + MOVxw_REG(gd, ed); + MOVxw_REG(ed, x1); + } else { + GETGD; + addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, rex, 0, 0); + TSTx_mask(ed, 1, 0, 1+rex.w); // mask=3 or 7 + B_MARK(cNE); + MARKLOCK; + LDAXRxw(x1, ed); + STLXRxw(x3, gd, ed); + CBNZx_MARKLOCK(x3); + B_MARK2_nocond; + MARK; + LDRxw_U12(x1, ed, 0); + STRxw_U12(gd, ed, 0); + MARK2; + MOVxw_REG(gd, x1); + } + break; + default: DEFAULT; } diff --git a/src/emu/x64runf0.c b/src/emu/x64runf0.c index cdf75eac..9ce3d01e 100644 --- a/src/emu/x64runf0.c +++ b/src/emu/x64runf0.c @@ -571,7 +571,50 @@ int RunF0(x64emu_t *emu, rex_t rex) pthread_mutex_unlock(&emu->context->mutex_lock); #endif break; - + case 0x87: /* XCHG Ed,Gd */ + nextop = F8; +#ifdef DYNAREC + GETED(0); + GETGD; + if(MODREG) { + if(rex.w) { + tmp64u = GD->q[0]; + GD->q[0] = ED->q[0]; + ED->q[0] = tmp64u; + } else { + tmp32u = GD->dword[0]; + GD->q[0] = ED->dword[0]; + ED->q[0] = tmp32u; + } + } else { + if(rex.w) { + GD->q[0] = arm64_lock_xchg(ED, GD->q[0]); + } else { + do { + tmp32u = arm64_lock_read_d(ED); + } while(arm64_lock_write_d(ED, GD->dword[0])); + GD->q[0] = tmp32u; + } + } +#else + GETED(0); + GETGD; + pthread_mutex_lock(&emu->context->mutex_lock); + if(rex.w) { + tmp64u = GD->q[0]; + GD->q[0] = ED->q[0]; + ED->q[0] = tmp64u; + } else { + tmp32u = GD->dword[0]; + GD->q[0] = ED->dword[0]; + if(MODREG) + ED->q[0] = tmp32u; + else + ED->dword[0] = tmp32u; + } + pthread_mutex_unlock(&emu->context->mutex_lock); +#endif + break; case 0xFF: /* GRP 5 Ed */ nextop = F8; GETED(0); |