|
@@ -1799,13 +1799,13 @@ static void decode_root(DisasContext *s, CPUX86State *env, X86OpEntry *entry, ui
|
|
|
}
|
|
|
|
|
|
|
|
|
-static int decode_modrm(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
|
|
|
- X86DecodedOp *op, X86OpType type)
|
|
|
+static int decode_modrm(DisasContext *s, CPUX86State *env,
|
|
|
+ X86DecodedInsn *decode, X86DecodedOp *op)
|
|
|
{
|
|
|
int modrm = get_modrm(s, env);
|
|
|
if ((modrm >> 6) == 3) {
|
|
|
op->n = (modrm & 7);
|
|
|
- if (type != X86_TYPE_Q && type != X86_TYPE_N) {
|
|
|
+ if (op->unit != X86_OP_MMX) {
|
|
|
op->n |= REX_B(s);
|
|
|
}
|
|
|
} else {
|
|
@@ -2040,7 +2040,7 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
|
|
|
/* fall through */
|
|
|
case X86_TYPE_nop: /* modrm operand decoded but not fetched */
|
|
|
get_modrm:
|
|
|
- decode_modrm(s, env, decode, op, type);
|
|
|
+ decode_modrm(s, env, decode, op);
|
|
|
break;
|
|
|
|
|
|
case X86_TYPE_O: /* Absolute address encoded in the instruction */
|