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=-15.8 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,USER_AGENT_GIT 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 A8852C47091 for ; Sun, 30 May 2021 15:06:03 +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 010E6611AC for ; Sun, 30 May 2021 15:06:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 010E6611AC 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]:34638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnN0s-0006y8-5r for qemu-devel@archiver.kernel.org; Sun, 30 May 2021 11:06:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnN0A-00064A-D5 for qemu-devel@nongnu.org; Sun, 30 May 2021 11:05:20 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:40793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnN02-00080U-GP for qemu-devel@nongnu.org; Sun, 30 May 2021 11:05:18 -0400 Received: by mail-pj1-x102b.google.com with SMTP id jz2-20020a17090b14c2b0290162cf0b5a35so1478187pjb.5 for ; Sun, 30 May 2021 08:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SCub222FY0LIs8nFOfHeHeUPUh/qegC4rB9wHQgYW8g=; b=LKRZI0zfSwLHj75h5GCqRdxqHbJrauP7wp1uSu6Dw/bUuJ6im1CEozVQAkrFBZSNmH kiDrF0rZ0XRBdGFAUkr5n4EBGvAIpSl4GMynn8eIDpj2BPOyPT5wxkyHCQXTTnikczcc B0dESWkqZeBFRnyfxhRKo0PxgiE+TC0jzSVAtjSrFREfiAnog/3HCANuFlr/Go2w6TRz okpJJfTwdrENKrJVWvnVBw1eiHRDIMLZAeNOplYxcZe3CiiYyx11hOV6CWXbZuBJAlhk XNHq55P3UzaRuQV1N+HikOvbwwgRcRl9BorW8qy/pulQvw8poGpzYuLMSSkjTHNiNTsw pAjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SCub222FY0LIs8nFOfHeHeUPUh/qegC4rB9wHQgYW8g=; b=frPhjByhUJ2kcFR/0KXwfMUAbbKbI8+cMXQV9cgRzaJkL3wA+Wn80yYH2n8mwyQssx yRHAdJrJRYY5xl75rV+LttfWtYMI7CVRaqkbnjFIAWkUnmbDr1XYnNOtopnl86+23xLm ard/6qWAy/crwJBMWR700MSj8gQfJ4n5lWDS6ixcgWfCQCkoov5ABWAxUAOLYJQSMvWk cDR7cxFkR102gJEqYHiPo53YsbajuIc3dndIZah1Cfe+XMDSfV2C1FXfddQIFdwLaH29 gS1Be6QlVunf+5tHGMWXIrgq+F3Q0dezVrjIvAAceef8r9nEcBTnoWJjCZtJJTt68uvP kI6g== X-Gm-Message-State: AOAM531yF2fZwflmI4JSgUEZGc4l1jfUo+nKAgW8FE/+ZbIvQJKZeUQy g3Qs3ozyL7asexrkCbQl74QBOGrbV3E= X-Google-Smtp-Source: ABdhPJxWjHLyU8QNmgLRVnu6DBZa7lFgV6+UiiP+5cjPXiCDlhwIxF3YB9hs/Sf16t4uiI73CWWmQg== X-Received: by 2002:a17:902:8c8d:b029:fe:6409:56a6 with SMTP id t13-20020a1709028c8db02900fe640956a6mr16707869plo.82.1622387108843; Sun, 30 May 2021 08:05:08 -0700 (PDT) Received: from crdev.local ([104.160.18.162]) by smtp.gmail.com with ESMTPSA id x10sm4210110pfm.117.2021.05.30.08.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 May 2021 08:05:08 -0700 (PDT) From: Ziqiao Kong To: qemu-devel@nongnu.org Subject: [PATCH v7 2/2] target/i386: Correct implementation for FCS, FIP, FDS and FDP Date: Sun, 30 May 2021 23:01:14 +0800 Message-Id: <20210530150112.74411-2-ziqiaokong@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210530150112.74411-1-ziqiaokong@gmail.com> References: <20210530150112.74411-1-ziqiaokong@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=ziqiaokong@gmail.com; helo=mail-pj1-x102b.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: pbonzini@redhat.com, richard.henderson@linaro.org, ehabkost@redhat.com, Ziqiao Kong Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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