Skip to content

Commit

Permalink
Merge branch 'eflags3' of git://github.com/rth7680/qemu
Browse files Browse the repository at this point in the history 
* 'eflags3' of git://github.com/rth7680/qemu: (61 commits)
  target-i386: Use movcond to implement shiftd.
  target-i386: Discard CC_OP computation in set_cc_op also
  target-i386: Use movcond to implement rotate flags.
  target-i386: Use movcond to implement shift flags.
  target-i386: Add CC_OP_CLR
  target-i386: Implement tzcnt and fix lzcnt
  target-i386: Use clz/ctz for bsf/bsr helpers
  target-i386: Implement ADX extension
  target-i386: Implement RORX
  target-i386: Implement SHLX, SARX, SHRX
  target-i386: Implement PDEP, PEXT
  target-i386: Implement MULX
  target-i386: Implement BZHI
  target-i386: Implement BLSR, BLSMSK, BLSI
  target-i386: Implement BEXTR
  target-i386: Implement ANDN
  target-i386: Implement MOVBE
  target-i386: Decode the VEX prefixes
  target-i386: Tidy prefix parsing
  target-i386: Use CC_SRC2 for ADC and SBB
  ...
  • Loading branch information
@blueswirl
blueswirl committed Feb 23, 2013
2 parents 6ab7e54 + f437d0a commit f708e73
Show file tree
Hide file tree
Showing 10 changed files with 1,904 additions and 1,483 deletions.
260 changes: 132 additions & 128 deletions target-i386/cc_helper.c
View file
Expand Up @@ -75,243 +75,247 @@ const uint8_t parity_table[256] = {

#endif

static int compute_all_eflags(CPUX86State *env)
static target_ulong compute_all_adcx(target_ulong dst, target_ulong src1,
target_ulong src2)
{
return CC_SRC;
return (src1 & ~CC_C) | (dst * CC_C);
}

static int compute_c_eflags(CPUX86State *env)
static target_ulong compute_all_adox(target_ulong dst, target_ulong src1,
target_ulong src2)
{
return CC_SRC & CC_C;
return (src1 & ~CC_O) | (src2 * CC_O);
}

uint32_t helper_cc_compute_all(CPUX86State *env, int op)
static target_ulong compute_all_adcox(target_ulong dst, target_ulong src1,
target_ulong src2)
{
return (src1 & ~(CC_C | CC_O)) | (dst * CC_C) | (src2 * CC_O);
}

target_ulong helper_cc_compute_all(target_ulong dst, target_ulong src1,
target_ulong src2, int op)
{
switch (op) {
default: /* should never happen */
return 0;

case CC_OP_EFLAGS:
return compute_all_eflags(env);
return src1;
case CC_OP_CLR:
return CC_Z;

case CC_OP_MULB:
return compute_all_mulb(env);
return compute_all_mulb(dst, src1);
case CC_OP_MULW:
return compute_all_mulw(env);
return compute_all_mulw(dst, src1);
case CC_OP_MULL:
return compute_all_mull(env);
return compute_all_mull(dst, src1);

case CC_OP_ADDB:
return compute_all_addb(env);
return compute_all_addb(dst, src1);
case CC_OP_ADDW:
return compute_all_addw(env);
return compute_all_addw(dst, src1);
case CC_OP_ADDL:
return compute_all_addl(env);
return compute_all_addl(dst, src1);

case CC_OP_ADCB:
return compute_all_adcb(env);
return compute_all_adcb(dst, src1, src2);
case CC_OP_ADCW:
return compute_all_adcw(env);
return compute_all_adcw(dst, src1, src2);
case CC_OP_ADCL:
return compute_all_adcl(env);
return compute_all_adcl(dst, src1, src2);

case CC_OP_SUBB:
return compute_all_subb(env);
return compute_all_subb(dst, src1);
case CC_OP_SUBW:
return compute_all_subw(env);
return compute_all_subw(dst, src1);
case CC_OP_SUBL:
return compute_all_subl(env);
return compute_all_subl(dst, src1);

case CC_OP_SBBB:
return compute_all_sbbb(env);
return compute_all_sbbb(dst, src1, src2);
case CC_OP_SBBW:
return compute_all_sbbw(env);
return compute_all_sbbw(dst, src1, src2);
case CC_OP_SBBL:
return compute_all_sbbl(env);
return compute_all_sbbl(dst, src1, src2);

case CC_OP_LOGICB:
return compute_all_logicb(env);
return compute_all_logicb(dst, src1);
case CC_OP_LOGICW:
return compute_all_logicw(env);
return compute_all_logicw(dst, src1);
case CC_OP_LOGICL:
return compute_all_logicl(env);
return compute_all_logicl(dst, src1);

case CC_OP_INCB:
return compute_all_incb(env);
return compute_all_incb(dst, src1);
case CC_OP_INCW:
return compute_all_incw(env);
return compute_all_incw(dst, src1);
case CC_OP_INCL:
return compute_all_incl(env);
return compute_all_incl(dst, src1);

case CC_OP_DECB:
return compute_all_decb(env);
return compute_all_decb(dst, src1);
case CC_OP_DECW:
return compute_all_decw(env);
return compute_all_decw(dst, src1);
case CC_OP_DECL:
return compute_all_decl(env);
return compute_all_decl(dst, src1);

case CC_OP_SHLB:
return compute_all_shlb(env);
return compute_all_shlb(dst, src1);
case CC_OP_SHLW:
return compute_all_shlw(env);
return compute_all_shlw(dst, src1);
case CC_OP_SHLL:
return compute_all_shll(env);
return compute_all_shll(dst, src1);

case CC_OP_SARB:
return compute_all_sarb(env);
return compute_all_sarb(dst, src1);
case CC_OP_SARW:
return compute_all_sarw(env);
return compute_all_sarw(dst, src1);
case CC_OP_SARL:
return compute_all_sarl(env);
return compute_all_sarl(dst, src1);

case CC_OP_BMILGB:
return compute_all_bmilgb(dst, src1);
case CC_OP_BMILGW:
return compute_all_bmilgw(dst, src1);
case CC_OP_BMILGL:
return compute_all_bmilgl(dst, src1);

case CC_OP_ADCX:
return compute_all_adcx(dst, src1, src2);
case CC_OP_ADOX:
return compute_all_adox(dst, src1, src2);
case CC_OP_ADCOX:
return compute_all_adcox(dst, src1, src2);

#ifdef TARGET_X86_64
case CC_OP_MULQ:
return compute_all_mulq(env);

return compute_all_mulq(dst, src1);
case CC_OP_ADDQ:
return compute_all_addq(env);

return compute_all_addq(dst, src1);
case CC_OP_ADCQ:
return compute_all_adcq(env);

return compute_all_adcq(dst, src1, src2);
case CC_OP_SUBQ:
return compute_all_subq(env);

return compute_all_subq(dst, src1);
case CC_OP_SBBQ:
return compute_all_sbbq(env);

return compute_all_sbbq(dst, src1, src2);
case CC_OP_LOGICQ:
return compute_all_logicq(env);

return compute_all_logicq(dst, src1);
case CC_OP_INCQ:
return compute_all_incq(env);

return compute_all_incq(dst, src1);
case CC_OP_DECQ:
return compute_all_decq(env);

return compute_all_decq(dst, src1);
case CC_OP_SHLQ:
return compute_all_shlq(env);

return compute_all_shlq(dst, src1);
case CC_OP_SARQ:
return compute_all_sarq(env);
return compute_all_sarq(dst, src1);
case CC_OP_BMILGQ:
return compute_all_bmilgq(dst, src1);
#endif
}
}

uint32_t cpu_cc_compute_all(CPUX86State *env, int op)
{
return helper_cc_compute_all(env, op);
return helper_cc_compute_all(CC_DST, CC_SRC, CC_SRC2, op);
}

uint32_t helper_cc_compute_c(CPUX86State *env, int op)
target_ulong helper_cc_compute_c(target_ulong dst, target_ulong src1,
target_ulong src2, int op)
{
switch (op) {
default: /* should never happen */
case CC_OP_LOGICB:
case CC_OP_LOGICW:
case CC_OP_LOGICL:
case CC_OP_LOGICQ:
case CC_OP_CLR:
return 0;

case CC_OP_EFLAGS:
return compute_c_eflags(env);
case CC_OP_SARB:
case CC_OP_SARW:
case CC_OP_SARL:
case CC_OP_SARQ:
case CC_OP_ADOX:
return src1 & 1;

case CC_OP_INCB:
case CC_OP_INCW:
case CC_OP_INCL:
case CC_OP_INCQ:
case CC_OP_DECB:
case CC_OP_DECW:
case CC_OP_DECL:
case CC_OP_DECQ:
return src1;

case CC_OP_MULB:
return compute_c_mull(env);
case CC_OP_MULW:
return compute_c_mull(env);
case CC_OP_MULL:
return compute_c_mull(env);
case CC_OP_MULQ:
return src1 != 0;

case CC_OP_ADCX:
case CC_OP_ADCOX:
return dst;

case CC_OP_ADDB:
return compute_c_addb(env);
return compute_c_addb(dst, src1);
case CC_OP_ADDW:
return compute_c_addw(env);
return compute_c_addw(dst, src1);
case CC_OP_ADDL:
return compute_c_addl(env);
return compute_c_addl(dst, src1);

case CC_OP_ADCB:
return compute_c_adcb(env);
return compute_c_adcb(dst, src1, src2);
case CC_OP_ADCW:
return compute_c_adcw(env);
return compute_c_adcw(dst, src1, src2);
case CC_OP_ADCL:
return compute_c_adcl(env);
return compute_c_adcl(dst, src1, src2);

case CC_OP_SUBB:
return compute_c_subb(env);
return compute_c_subb(dst, src1);
case CC_OP_SUBW:
return compute_c_subw(env);
return compute_c_subw(dst, src1);
case CC_OP_SUBL:
return compute_c_subl(env);
return compute_c_subl(dst, src1);

case CC_OP_SBBB:
return compute_c_sbbb(env);
return compute_c_sbbb(dst, src1, src2);
case CC_OP_SBBW:
return compute_c_sbbw(env);
return compute_c_sbbw(dst, src1, src2);
case CC_OP_SBBL:
return compute_c_sbbl(env);

case CC_OP_LOGICB:
return compute_c_logicb();
case CC_OP_LOGICW:
return compute_c_logicw();
case CC_OP_LOGICL:
return compute_c_logicl();

case CC_OP_INCB:
return compute_c_incl(env);
case CC_OP_INCW:
return compute_c_incl(env);
case CC_OP_INCL:
return compute_c_incl(env);

case CC_OP_DECB:
return compute_c_incl(env);
case CC_OP_DECW:
return compute_c_incl(env);
case CC_OP_DECL:
return compute_c_incl(env);
return compute_c_sbbl(dst, src1, src2);

case CC_OP_SHLB:
return compute_c_shlb(env);
return compute_c_shlb(dst, src1);
case CC_OP_SHLW:
return compute_c_shlw(env);
return compute_c_shlw(dst, src1);
case CC_OP_SHLL:
return compute_c_shll(env);
return compute_c_shll(dst, src1);

case CC_OP_SARB:
return compute_c_sarl(env);
case CC_OP_SARW:
return compute_c_sarl(env);
case CC_OP_SARL:
return compute_c_sarl(env);
case CC_OP_BMILGB:
return compute_c_bmilgb(dst, src1);
case CC_OP_BMILGW:
return compute_c_bmilgw(dst, src1);
case CC_OP_BMILGL:
return compute_c_bmilgl(dst, src1);

#ifdef TARGET_X86_64
case CC_OP_MULQ:
return compute_c_mull(env);

case CC_OP_ADDQ:
return compute_c_addq(env);

return compute_c_addq(dst, src1);
case CC_OP_ADCQ:
return compute_c_adcq(env);

return compute_c_adcq(dst, src1, src2);
case CC_OP_SUBQ:
return compute_c_subq(env);

return compute_c_subq(dst, src1);
case CC_OP_SBBQ:
return compute_c_sbbq(env);

case CC_OP_LOGICQ:
return compute_c_logicq();

case CC_OP_INCQ:
return compute_c_incl(env);

case CC_OP_DECQ:
return compute_c_incl(env);

return compute_c_sbbq(dst, src1, src2);
case CC_OP_SHLQ:
return compute_c_shlq(env);

case CC_OP_SARQ:
return compute_c_sarl(env);
return compute_c_shlq(dst, src1);
case CC_OP_BMILGQ:
return compute_c_bmilgq(dst, src1);
#endif
}
}
Expand All @@ -326,7 +330,7 @@ target_ulong helper_read_eflags(CPUX86State *env)
{
uint32_t eflags;

eflags = helper_cc_compute_all(env, CC_OP);
eflags = cpu_cc_compute_all(env, CC_OP);
eflags |= (DF & DF_MASK);
eflags |= env->eflags & ~(VM_MASK | RF_MASK);
return eflags;
Expand Down

0 comments on commit f708e73

Please sign in to comment.