ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmpxchg8b fix - added cmpxchg16b 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4522 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2008-05-22 09:52:38 +00:00
parent 1130328ecb
commit 1b9d9ebb8a
3 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target-i386/helper.c
View File

@ -1879,8 +1879,8 @@ void helper_cmpxchg8b(target_ulong a0)
eflags = cc_table[CC_OP].compute_all();
d = ldq(a0);
if (d == (((uint64_t)EDX << 32) | EAX)) {
stq(a0, ((uint64_t)ECX << 32) | EBX);
if (d == (((uint64_t)EDX << 32) | (uint32_t)EAX)) {
stq(a0, ((uint64_t)ECX << 32) | (uint32_t)EBX);
eflags |= CC_Z;
} else {
EDX = (uint32_t)(d >> 32);
@ -1890,6 +1890,28 @@ void helper_cmpxchg8b(target_ulong a0)
CC_SRC = eflags;
}
#ifdef TARGET_X86_64
void helper_cmpxchg16b(target_ulong a0)
{
uint64_t d0, d1;
int eflags;
eflags = cc_table[CC_OP].compute_all();
d0 = ldq(a0);
d1 = ldq(a0 + 8);
if (d0 == EAX && d1 == EDX) {
stq(a0, EBX);
stq(a0 + 8, ECX);
eflags |= CC_Z;
} else {
EDX = d1;
EAX = d0;
eflags &= ~CC_Z;
}
CC_SRC = eflags;
}
#endif
void helper_single_step(void)
{
env->dr[6] |= 0x4000;

3
target-i386/helper.h
View File

@ -75,6 +75,9 @@ void helper_boundl(target_ulong a0, int v);
void helper_rsm(void);
void helper_into(int next_eip_addend);
void helper_cmpxchg8b(target_ulong a0);
#ifdef TARGET_X86_64
void helper_cmpxchg16b(target_ulong a0);
#endif
void helper_single_step(void);
void helper_cpuid(void);
void helper_rdtsc(void);

25
target-i386/translate.c
View File

@ -4333,11 +4333,26 @@ static target_ulong disas_insn(DisasContext *s, target_ulong pc_start)
mod = (modrm >> 6) & 3;
if ((mod == 3) || ((modrm & 0x38) != 0x8))
goto illegal_op;
gen_jmp_im(pc_start - s->cs_base);
if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op);
gen_lea_modrm(s, modrm, &reg_addr, &offset_addr);
tcg_gen_helper_0_1(helper_cmpxchg8b, cpu_A0);
#ifdef TARGET_X86_64
if (dflag == 2) {
if (!(s->cpuid_ext_features & CPUID_EXT_CX16))
goto illegal_op;
gen_jmp_im(pc_start - s->cs_base);
if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op);
gen_lea_modrm(s, modrm, &reg_addr, &offset_addr);
tcg_gen_helper_0_1(helper_cmpxchg16b, cpu_A0);
} else
#endif
{
if (!(s->cpuid_features & CPUID_CX8))
goto illegal_op;
gen_jmp_im(pc_start - s->cs_base);
if (s->cc_op != CC_OP_DYNAMIC)
gen_op_set_cc_op(s->cc_op);
gen_lea_modrm(s, modrm, &reg_addr, &offset_addr);
tcg_gen_helper_0_1(helper_cmpxchg8b, cpu_A0);
}
s->cc_op = CC_OP_EFLAGS;
break;