From: Peter Maydell <peter.maydell@linaro.org>
To: QEMU Developers <qemu-devel@nongnu.org>
Cc: Anthony Liguori <aliguori@us.ibm.com>,
Richard Henderson <rth@twiddle.net>,
Patch Tracking <patches@linaro.org>
Subject: Re: [Qemu-devel] [PATCH] target-i386: Only provide CMOV and friends if feature bit set
Date: Thu, 12 Sep 2013 18:49:01 +0100 [thread overview]
Message-ID: <CAFEAcA8DqxB=bjwimC76DO92URRgLBx0YT=ezvsR_D5dVT-2kQ@mail.gmail.com> (raw)
In-Reply-To: <CAFEAcA-kLudXsR7zkCpYp+KEPzBPyTb29x=k4BBX5oejFmvayQ@mail.gmail.com>
Ping^4!
thanks
-- PMM
On 2 September 2013 09:24, Peter Maydell <peter.maydell@linaro.org> wrote:
> Ping^3!
>
> thanks
> -- PMM
>
> On 20 August 2013 13:59, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Ping^2! This has been reviewed and I've checked that the
>> patch still applies to master.
>>
>> thanks
>> -- PMM
>>
>> On 25 July 2013 17:54, Peter Maydell <peter.maydell@linaro.org> wrote:
>>> Ping!
>>>
>>> (patchwork url: http://patchwork.ozlabs.org/patch/259148/)
>>>
>>> thanks
>>> -- PMM
>>>
>>> On 15 July 2013 18:21, Peter Maydell <peter.maydell@linaro.org> wrote:
>>>> The instructions CMOVcc, FCMOVcc and F[U]COMI[P] should only be
>>>> present if the CMOV feature bit is set. Add missing feature bit
>>>> checks so we correctly fault if emulating a 486 or 586.
>>>> This fixes bug LP:1201446.
>>>>
>>>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>>>> ---
>>>> target-i386/translate.c | 19 +++++++++++++++++++
>>>> 1 file changed, 19 insertions(+)
>>>>
>>>> diff --git a/target-i386/translate.c b/target-i386/translate.c
>>>> index 6550c27..f75e3b1 100644
>>>> --- a/target-i386/translate.c
>>>> +++ b/target-i386/translate.c
>>>> @@ -6434,12 +6434,18 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
>>>> }
>>>> break;
>>>> case 0x1d: /* fucomi */
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> gen_update_cc_op(s);
>>>> gen_helper_fmov_FT0_STN(cpu_env, tcg_const_i32(opreg));
>>>> gen_helper_fucomi_ST0_FT0(cpu_env);
>>>> set_cc_op(s, CC_OP_EFLAGS);
>>>> break;
>>>> case 0x1e: /* fcomi */
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> gen_update_cc_op(s);
>>>> gen_helper_fmov_FT0_STN(cpu_env, tcg_const_i32(opreg));
>>>> gen_helper_fcomi_ST0_FT0(cpu_env);
>>>> @@ -6495,6 +6501,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
>>>> }
>>>> break;
>>>> case 0x3d: /* fucomip */
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> gen_update_cc_op(s);
>>>> gen_helper_fmov_FT0_STN(cpu_env, tcg_const_i32(opreg));
>>>> gen_helper_fucomi_ST0_FT0(cpu_env);
>>>> @@ -6502,6 +6511,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
>>>> set_cc_op(s, CC_OP_EFLAGS);
>>>> break;
>>>> case 0x3e: /* fcomip */
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> gen_update_cc_op(s);
>>>> gen_helper_fmov_FT0_STN(cpu_env, tcg_const_i32(opreg));
>>>> gen_helper_fcomi_ST0_FT0(cpu_env);
>>>> @@ -6518,6 +6530,10 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
>>>> (JCC_BE << 1),
>>>> (JCC_P << 1),
>>>> };
>>>> +
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> op1 = fcmov_cc[op & 3] | (((op >> 3) & 1) ^ 1);
>>>> l1 = gen_new_label();
>>>> gen_jcc1_noeob(s, op1, l1);
>>>> @@ -6889,6 +6905,9 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s,
>>>> gen_ldst_modrm(env, s, modrm, OT_BYTE, OR_TMP0, 1);
>>>> break;
>>>> case 0x140 ... 0x14f: /* cmov Gv, Ev */
>>>> + if (!(s->cpuid_features & CPUID_CMOV)) {
>>>> + goto illegal_op;
>>>> + }
>>>> ot = dflag + OT_WORD;
>>>> modrm = cpu_ldub_code(env, s->pc++);
>>>> reg = ((modrm >> 3) & 7) | rex_r;
>>>> --
>>>> 1.7.9.5
>>>>
>>>>
prev parent reply other threads:[~2013-09-12 17:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-15 17:21 [Qemu-devel] [PATCH] target-i386: Only provide CMOV and friends if feature bit set Peter Maydell
2013-07-25 16:54 ` Peter Maydell
2013-07-25 17:53 ` Richard Henderson
2013-08-20 12:59 ` Peter Maydell
2013-08-20 15:15 ` Richard Henderson
2013-09-02 8:24 ` Peter Maydell
2013-09-12 17:49 ` Peter Maydell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFEAcA8DqxB=bjwimC76DO92URRgLBx0YT=ezvsR_D5dVT-2kQ@mail.gmail.com' \
--to=peter.maydell@linaro.org \
--cc=aliguori@us.ibm.com \
--cc=patches@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).