From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55EDAC49EA5 for ; Thu, 24 Jun 2021 17:07:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B381613DC for ; Thu, 24 Jun 2021 17:07:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B381613DC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwSpP-00041L-AL for qemu-devel@archiver.kernel.org; Thu, 24 Jun 2021 13:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwSod-00032G-Hz for qemu-devel@nongnu.org; Thu, 24 Jun 2021 13:06:59 -0400 Received: from mail-yb1-xb2d.google.com ([2607:f8b0:4864:20::b2d]:46820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwSoa-0007S9-5p for qemu-devel@nongnu.org; Thu, 24 Jun 2021 13:06:59 -0400 Received: by mail-yb1-xb2d.google.com with SMTP id s17so295275ybk.13 for ; Thu, 24 Jun 2021 10:06:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=c5vR8d3Z1yzmNQTWXrh5HZ3VwrD86iGy/dt5Z++MAm0=; b=m7ZZfxgFz4cACkMb9cobXNDbOaj2maPQVqS9Y7WmA0UxPkout83YRiDqg470/NTU2U /IWLr7S7uKJKZH1bURW2T82rChneygFGNc3l7/j/IPxiFmMXGovUycyWTpXXdHhZ3Ycq dMilpcaQnE+LkfJRt0PNf1awwWCIsviNHYIjp55KJOoEH70YiwsZNwDjq0WwaRVFG8oT HwUGh6TwurwYvycbfeYY8bvor2Wowm7bC7fdzzukASDLEdhvB4GaKT/Gn6bmnspzAUBv Tsqkc8uUzNZYMnrNp5+JKqSBnw4jKRc0jhhrAOJ/TzpDRGOLWlx0ACDw5ODVra7bir8U EGsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=c5vR8d3Z1yzmNQTWXrh5HZ3VwrD86iGy/dt5Z++MAm0=; b=WN6UCJQ+jAQT7X5YFaUM3Su1W4FPDbSN1EG4CkMkRLSpPHZu3EuRWDQsFZT5lI4U/a S9O0apNRjkm95q04pOtiR3QTtaFq4WsErpqc2oatpRv1e9vB5HokqCpkQUJGLbbMeSq4 gALAUY9dD+Y7T0zre5jMmKQJfgkA0SJsAFxTEEHSVKHQ/OC5LnBxV45e5ga85l7l3Snq CECMwCzBwfGzZyoqDCH1R/253G0NJZJpxiao8QGDdSnXivSEeUITMcRH6P6i1RX1Prfn gZoe4uYyOR9TXoMtBdTZylM/JtEBPY2zhlU3llJSwy58tiTjIS+4uIn9X3yd6FG6pQCC lrIA== X-Gm-Message-State: AOAM532+w8TOalhH2GY98BVK22oBJOHAn/FsiD1feaNQSSPVFvQy54QS CfefllQ83etYjMyzALEu8Zahgx9PIXJK8dh4MM7kBH2+ShY= X-Google-Smtp-Source: ABdhPJwIMFUM9zVcM+FGmJPjIq4u3nrhi4ZPXP8R6fa6p3++NrH2WHaVX/1Dq9LLKer9rkRJFir6yW9jkX2QbHrGXq4= X-Received: by 2002:a25:2405:: with SMTP id k5mr6370454ybk.405.1624554414682; Thu, 24 Jun 2021 10:06:54 -0700 (PDT) MIME-Version: 1.0 References: <20210530150112.74411-1-ziqiaokong@gmail.com> <20210530150112.74411-2-ziqiaokong@gmail.com> In-Reply-To: From: Ziqiao Kong Date: Fri, 25 Jun 2021 01:06:43 +0800 Message-ID: Subject: Re: [PATCH v7 2/2] target/i386: Correct implementation for FCS, FIP, FDS and FDP To: QEMU Developers Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::b2d; envelope-from=ziqiaokong@gmail.com; helo=mail-yb1-xb2d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Ping. On Fri, Jun 11, 2021 at 10:32 PM Ziqiao Kong wrote: > > Ping. > > On Fri, Jun 4, 2021 at 11:04 PM Ziqiao Kong wrote: > > > > Ping. > > > > Sorry again for the previous duplicate emails. > > > > On Sun, May 30, 2021 at 11:05 PM Ziqiao Kong wrote: > > > > > > Update FCS:FIP and FDS:FDP according to the Intel Manual Vol.1 8.1.8. Note that > > > CPUID.(EAX=07H,ECX=0H):EBX[bit 13] is not implemented by design in this patch > > > and will be added along with TCG features flag in a separate patch later. > > > > > > Signed-off-by: Ziqiao Kong > > > --- > > > Sorry for the duplicate emails due to my bad network. The v7 has no > > > difference from v6 and is sent just for clarification. > > > Changes since v5: > > > - Improve code indention in translate.c. > > > Changes since v4: > > > - Remove the dead code about CPUID_7_0_EBX_FCS_FDS. > > > - Rewrite the commit message. > > > --- > > > target/i386/cpu.h | 2 ++ > > > target/i386/tcg/fpu_helper.c | 32 +++++++++++-------------- > > > target/i386/tcg/translate.c | 45 +++++++++++++++++++++++++++++++++++- > > > 3 files changed, 59 insertions(+), 20 deletions(-) > > > > > > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > > > index da72aa5228..147dadcce0 100644 > > > --- a/target/i386/cpu.h > > > +++ b/target/i386/cpu.h > > > @@ -1455,6 +1455,8 @@ typedef struct CPUX86State { > > > FPReg fpregs[8]; > > > /* KVM-only so far */ > > > uint16_t fpop; > > > + uint16_t fpcs; > > > + uint16_t fpds; > > > uint64_t fpip; > > > uint64_t fpdp; > > > > > > diff --git a/target/i386/tcg/fpu_helper.c b/target/i386/tcg/fpu_helper.c > > > index 1b30f1bb73..d953f04bb5 100644 > > > --- a/target/i386/tcg/fpu_helper.c > > > +++ b/target/i386/tcg/fpu_helper.c > > > @@ -728,6 +728,10 @@ void helper_fninit(CPUX86State *env) > > > { > > > env->fpus = 0; > > > env->fpstt = 0; > > > + env->fpcs = 0; > > > + env->fpds = 0; > > > + env->fpip = 0; > > > + env->fpdp = 0; > > > cpu_set_fpuc(env, 0x37f); > > > env->fptags[0] = 1; > > > env->fptags[1] = 1; > > > @@ -2357,19 +2361,19 @@ static void do_fstenv(CPUX86State *env, target_ulong ptr, int data32, > > > cpu_stl_data_ra(env, ptr, env->fpuc, retaddr); > > > cpu_stl_data_ra(env, ptr + 4, fpus, retaddr); > > > cpu_stl_data_ra(env, ptr + 8, fptag, retaddr); > > > - cpu_stl_data_ra(env, ptr + 12, 0, retaddr); /* fpip */ > > > - cpu_stl_data_ra(env, ptr + 16, 0, retaddr); /* fpcs */ > > > - cpu_stl_data_ra(env, ptr + 20, 0, retaddr); /* fpoo */ > > > - cpu_stl_data_ra(env, ptr + 24, 0, retaddr); /* fpos */ > > > + cpu_stl_data_ra(env, ptr + 12, env->fpip, retaddr); /* fpip */ > > > + cpu_stl_data_ra(env, ptr + 16, env->fpcs, retaddr); /* fpcs */ > > > + cpu_stl_data_ra(env, ptr + 20, env->fpdp, retaddr); /* fpoo */ > > > + cpu_stl_data_ra(env, ptr + 24, env->fpds, retaddr); /* fpos */ > > > } else { > > > /* 16 bit */ > > > cpu_stw_data_ra(env, ptr, env->fpuc, retaddr); > > > cpu_stw_data_ra(env, ptr + 2, fpus, retaddr); > > > cpu_stw_data_ra(env, ptr + 4, fptag, retaddr); > > > - cpu_stw_data_ra(env, ptr + 6, 0, retaddr); > > > - cpu_stw_data_ra(env, ptr + 8, 0, retaddr); > > > - cpu_stw_data_ra(env, ptr + 10, 0, retaddr); > > > - cpu_stw_data_ra(env, ptr + 12, 0, retaddr); > > > + cpu_stw_data_ra(env, ptr + 6, env->fpip, retaddr); > > > + cpu_stw_data_ra(env, ptr + 8, env->fpcs, retaddr); > > > + cpu_stw_data_ra(env, ptr + 10, env->fpdp, retaddr); > > > + cpu_stw_data_ra(env, ptr + 12, env->fpds, retaddr); > > > } > > > } > > > > > > @@ -2436,17 +2440,7 @@ static void do_fsave(CPUX86State *env, target_ulong ptr, int data32, > > > } > > > > > > /* fninit */ > > > - env->fpus = 0; > > > - env->fpstt = 0; > > > - cpu_set_fpuc(env, 0x37f); > > > - env->fptags[0] = 1; > > > - env->fptags[1] = 1; > > > - env->fptags[2] = 1; > > > - env->fptags[3] = 1; > > > - env->fptags[4] = 1; > > > - env->fptags[5] = 1; > > > - env->fptags[6] = 1; > > > - env->fptags[7] = 1; > > > + helper_fninit(env); > > > } > > > > > > void helper_fsave(CPUX86State *env, target_ulong ptr, int data32) > > > diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c > > > index 5c1b7b87c5..4c57ee5c26 100644 > > > --- a/target/i386/tcg/translate.c > > > +++ b/target/i386/tcg/translate.c > > > @@ -5930,6 +5930,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > /* floats */ > > > case 0xd8 ... 0xdf: > > > { > > > + TCGv last_addr = tcg_temp_new(); > > > + int last_seg; > > > + bool update_fdp = false; > > > + bool update_fip = true; > > > + > > > if (s->flags & (HF_EM_MASK | HF_TS_MASK)) { > > > /* if CR0.EM or CR0.TS are set, generate an FPU exception */ > > > /* XXX: what to do if illegal op ? */ > > > @@ -5942,7 +5947,14 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > op = ((b & 7) << 3) | ((modrm >> 3) & 7); > > > if (mod != 3) { > > > /* memory op */ > > > - gen_lea_modrm(env, s, modrm); > > > + AddressParts a = gen_lea_modrm_0(env, s, modrm); > > > + TCGv ea = gen_lea_modrm_1(s, a); > > > + > > > + update_fdp = true; > > > + last_seg = a.def_seg; > > > + tcg_gen_mov_tl(last_addr, ea); > > > + gen_lea_v_seg(s, s->aflag, ea, a.def_seg, s->override); > > > + > > > switch (op) { > > > case 0x00 ... 0x07: /* fxxxs */ > > > case 0x10 ... 0x17: /* fixxxl */ > > > @@ -6070,20 +6082,24 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > case 0x0c: /* fldenv mem */ > > > gen_helper_fldenv(cpu_env, s->A0, > > > tcg_const_i32(dflag - 1)); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x0d: /* fldcw mem */ > > > tcg_gen_qemu_ld_i32(s->tmp2_i32, s->A0, > > > s->mem_index, MO_LEUW); > > > gen_helper_fldcw(cpu_env, s->tmp2_i32); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x0e: /* fnstenv mem */ > > > gen_helper_fstenv(cpu_env, s->A0, > > > tcg_const_i32(dflag - 1)); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x0f: /* fnstcw mem */ > > > gen_helper_fnstcw(s->tmp2_i32, cpu_env); > > > tcg_gen_qemu_st_i32(s->tmp2_i32, s->A0, > > > s->mem_index, MO_LEUW); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x1d: /* fldt mem */ > > > gen_helper_fldt_ST0(cpu_env, s->A0); > > > @@ -6095,15 +6111,18 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > case 0x2c: /* frstor mem */ > > > gen_helper_frstor(cpu_env, s->A0, > > > tcg_const_i32(dflag - 1)); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x2e: /* fnsave mem */ > > > gen_helper_fsave(cpu_env, s->A0, > > > tcg_const_i32(dflag - 1)); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x2f: /* fnstsw mem */ > > > gen_helper_fnstsw(s->tmp2_i32, cpu_env); > > > tcg_gen_qemu_st_i32(s->tmp2_i32, s->A0, > > > s->mem_index, MO_LEUW); > > > + update_fip = update_fdp = false; > > > break; > > > case 0x3c: /* fbld */ > > > gen_helper_fbld_ST0(cpu_env, s->A0); > > > @@ -6146,6 +6165,7 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > case 0: /* fnop */ > > > /* check exceptions (FreeBSD FPU probe) */ > > > gen_helper_fwait(cpu_env); > > > + update_fip = update_fdp = false; > > > break; > > > default: > > > goto unknown_op; > > > @@ -6315,9 +6335,11 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > break; > > > case 2: /* fclex */ > > > gen_helper_fclex(cpu_env); > > > + update_fip = update_fdp = false; > > > break; > > > case 3: /* fninit */ > > > gen_helper_fninit(cpu_env); > > > + update_fip = update_fdp = false; > > > break; > > > case 4: /* fsetpm (287 only, just do nop here) */ > > > break; > > > @@ -6438,6 +6460,27 @@ static target_ulong disas_insn(DisasContext *s, CPUState *cpu) > > > goto unknown_op; > > > } > > > } > > > + > > > + if (update_fip) { > > > + tcg_gen_ld32u_tl(s->T0, cpu_env, > > > + offsetof(CPUX86State, segs[R_CS].selector)); > > > + tcg_gen_st16_tl(s->T0, cpu_env, offsetof(CPUX86State, fpcs)); > > > + > > > + tcg_gen_movi_tl(s->T0, pc_start - s->cs_base); > > > + tcg_gen_st_tl(s->T0, cpu_env, offsetof(CPUX86State, fpip)); > > > + } > > > + > > > + if (update_fdp) { > > > + if (s->override >= 0) { > > > + last_seg = s->override; > > > + } > > > + tcg_gen_ld32u_tl(s->T0, cpu_env, > > > + offsetof(CPUX86State, > > > + segs[last_seg].selector)); > > > + tcg_gen_st16_tl(s->T0, cpu_env, offsetof(CPUX86State, fpds)); > > > + > > > + tcg_gen_st_tl(last_addr, cpu_env, offsetof(CPUX86State, fpdp)); > > > + } > > > } > > > break; > > > /************************/ > > > -- > > > 2.25.1 > > >