From patchwork Tue Feb 9 17:43:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8264561 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D1FD6BEEE5 for ; Tue, 9 Feb 2016 17:55:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC186201F2 for ; Tue, 9 Feb 2016 17:55:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0867220123 for ; Tue, 9 Feb 2016 17:55:20 +0000 (UTC) Received: from localhost ([::1]:58966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCVT-0008AZ-Ci for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 12:55:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCLh-0007wL-9w for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTCLg-0000t0-4d for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:13 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:36001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCLf-0000sv-Ie for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:11 -0500 Received: by mail-pf0-x243.google.com with SMTP id e127so2770085pfe.3 for ; Tue, 09 Feb 2016 09:45:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=WFNLTmnRh0AKeKikupA5CndwaVesZI7M6VmgNP6Lf7I=; b=BFkalGecoYdQvIeZvYZRwLcA2mF3us0ozoC36d6WU/k7zf9AhHLAc+3bIH6t9rgVAn BaCoinYNbLEhPZOc3dU36mZCF2KGDIXK2ZL3itxxJqFsrrucDHm7TaZHVC8+cH4mkyR8 NYy7VvvFJKffuofoyf1RTTLchjtXIhcXfpEIBsr22/jSNSXLhUKVJouXqO+PCMLyJ9gI VKtmNGACie2k/ZVe/yOsOJ7PJ+AF3SBEbpxfAqo0GktGBwBqB25/B7WmO3bOBefqusig PR5HcbKFCOKNw9N/v0CUoMvY0JibnCInzTBpWBkKcKHRxyK6MJfXUa5IC1n40/s+z8n2 p5aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=WFNLTmnRh0AKeKikupA5CndwaVesZI7M6VmgNP6Lf7I=; b=azGBDcD9BH00VJGfVD0ea9JhmULZUPD9tGtTaufWlgPqH9ybAzBwtsmrDCzTGVtyRJ KsS0+01ZPcfD9oxOJR2a1lEOnda0ztYCGrwqJcehK8Fd5yZy7Ul+TyQ6MrebOG+u8QPe 4eiwFvSVQkNwjnfeNwgpxZH91xzLilZ9APXRfYSVbeug8dMNOgj9PSaCirqPSi9bps0o jOf3Ww5H9HuwLnSNbgJ8WU8jU/h6SE7abp6FyYcpp6iNe/Jvmq1osOro0r7hbQoKRz/U +hekW/dW6FaZeCceCO8QiOawe3TX2Vcc64IlJ4L/MZaAVrem7wCn9+A3qb74Ru9BWA1s TJmg== X-Gm-Message-State: AG10YOREEyS/PQ4MVNkbWiSimeIjAg9dO4LMBHMz1pXyb1GeC53XEAxt+avOyN2eC4VjHg== X-Received: by 10.98.33.131 with SMTP id o3mr52203482pfj.97.1455039910922; Tue, 09 Feb 2016 09:45:10 -0800 (PST) Received: from bigtime.com (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id pu3sm52144740pac.9.2016.02.09.09.45.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 09:45:10 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2016 04:43:49 +1100 Message-Id: <1455039832-9133-14-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455039832-9133-1-git-send-email-rth@twiddle.net> References: <1455039832-9133-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::243 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 13/16] target-i386: Implement BNDLDX, BNDSTX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- target-i386/helper.h | 4 ++ target-i386/mpx_helper.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ target-i386/translate.c | 57 ++++++++++++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/target-i386/helper.h b/target-i386/helper.h index e40216b..709b195 100644 --- a/target-i386/helper.h +++ b/target-i386/helper.h @@ -17,6 +17,10 @@ DEF_HELPER_2(idivq_EAX, void, env, tl) #endif DEF_HELPER_FLAGS_2(bndck, TCG_CALL_NO_WG, void, env, i32) +DEF_HELPER_FLAGS_3(bndldx32, TCG_CALL_NO_WG, i64, env, tl, tl) +DEF_HELPER_FLAGS_3(bndldx64, TCG_CALL_NO_WG, i64, env, tl, tl) +DEF_HELPER_FLAGS_5(bndstx32, TCG_CALL_NO_WG, void, env, tl, tl, i64, i64) +DEF_HELPER_FLAGS_5(bndstx64, TCG_CALL_NO_WG, void, env, tl, tl, i64, i64) DEF_HELPER_2(aam, void, env, int) DEF_HELPER_2(aad, void, env, int) diff --git a/target-i386/mpx_helper.c b/target-i386/mpx_helper.c index e4d5aba..53d9834 100644 --- a/target-i386/mpx_helper.c +++ b/target-i386/mpx_helper.c @@ -59,3 +59,100 @@ void helper_bndck(CPUX86State *env, uint32_t fail) raise_exception_ra(env, EXCP05_BOUND, GETPC()); } } + +static uint64_t lookup_bte64(CPUX86State *env, uint64_t base, uintptr_t ra) +{ + uint64_t bndcsr, bde, bt; + + if ((env->hflags & HF_CPL_MASK) == 3) { + bndcsr = env->bndcs_regs.cfgu; + } else { + bndcsr = env->msr_bndcfgs; + } + + bde = (extract64(base, 20, 28) << 3) + (extract64(bndcsr, 20, 44) << 12); + bt = cpu_ldq_data_ra(env, bde, ra); + if ((bt & 1) == 0) { + env->bndcs_regs.sts = bde | 2; + raise_exception_ra(env, EXCP05_BOUND, ra); + } + + return (extract64(base, 3, 17) << 5) + (bt & ~7); +} + +static uint32_t lookup_bte32(CPUX86State *env, uint32_t base, uintptr_t ra) +{ + uint32_t bndcsr, bde, bt; + + if ((env->hflags & HF_CPL_MASK) == 3) { + bndcsr = env->bndcs_regs.cfgu; + } else { + bndcsr = env->msr_bndcfgs; + } + + bde = (extract32(base, 12, 20) << 2) + (bndcsr & TARGET_PAGE_MASK); + bt = cpu_ldl_data_ra(env, bde, ra); + if ((bt & 1) == 0) { + env->bndcs_regs.sts = bde | 2; + raise_exception_ra(env, EXCP05_BOUND, ra); + } + + return (extract32(base, 2, 10) << 4) + (bt & ~3); +} + +uint64_t helper_bndldx64(CPUX86State *env, target_ulong base, target_ulong ptr) +{ + uintptr_t ra = GETPC(); + uint64_t bte, lb, ub, pt; + + bte = lookup_bte64(env, base, ra); + lb = cpu_ldq_data_ra(env, bte, ra); + ub = cpu_ldq_data_ra(env, bte + 8, ra); + pt = cpu_ldq_data_ra(env, bte + 16, ra); + + if (pt != ptr) { + lb = ub = 0; + } + env->mmx_t0.MMX_Q(0) = ub; + return lb; +} + +uint64_t helper_bndldx32(CPUX86State *env, target_ulong base, target_ulong ptr) +{ + uintptr_t ra = GETPC(); + uint32_t bte, lb, ub, pt; + + bte = lookup_bte32(env, base, ra); + lb = cpu_ldl_data_ra(env, bte, ra); + ub = cpu_ldl_data_ra(env, bte + 4, ra); + pt = cpu_ldl_data_ra(env, bte + 8, ra); + + if (pt != ptr) { + lb = ub = 0; + } + return ((uint64_t)ub << 32) | lb; +} + +void helper_bndstx64(CPUX86State *env, target_ulong base, target_ulong ptr, + uint64_t lb, uint64_t ub) +{ + uintptr_t ra = GETPC(); + uint64_t bte; + + bte = lookup_bte64(env, base, ra); + cpu_stq_data_ra(env, bte, lb, ra); + cpu_stq_data_ra(env, bte + 8, ub, ra); + cpu_stq_data_ra(env, bte + 16, ptr, ra); +} + +void helper_bndstx32(CPUX86State *env, target_ulong base, target_ulong ptr, + uint64_t lb, uint64_t ub) +{ + uintptr_t ra = GETPC(); + uint32_t bte; + + bte = lookup_bte32(env, base, ra); + cpu_stl_data_ra(env, bte, lb, ra); + cpu_stl_data_ra(env, bte + 4, ub, ra); + cpu_stl_data_ra(env, bte + 8, ptr, ra); +} diff --git a/target-i386/translate.c b/target-i386/translate.c index 7db662f..0dda4a8 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7507,6 +7507,36 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, /* bnd registers are now in-use */ gen_set_hflag(s, HF_MPX_IU_MASK); } + } else if (mod != 3) { + /* bndldx */ + AddressParts a = gen_lea_modrm_0(env, s, modrm); + if (reg >= 4 + || (prefixes & PREFIX_LOCK) + || s->aflag == MO_16 + || a.base < -1) { + goto illegal_op; + } + if (a.base >= 0) { + tcg_gen_addi_tl(cpu_A0, cpu_regs[a.base], a.disp); + } else { + tcg_gen_movi_tl(cpu_A0, 0); + } + gen_lea_v_seg(s, s->aflag, cpu_A0, a.def_seg, s->override); + if (a.index >= 0) { + tcg_gen_mov_tl(cpu_T0, cpu_regs[a.index]); + } else { + tcg_gen_movi_tl(cpu_T0, 0); + } + if (CODE64(s)) { + gen_helper_bndldx64(cpu_bndl[reg], cpu_env, cpu_A0, cpu_T0); + tcg_gen_ld_i64(cpu_bndu[reg], cpu_env, + offsetof(CPUX86State, mmx_t0.MMX_Q(0))); + } else { + gen_helper_bndldx32(cpu_bndu[reg], cpu_env, cpu_A0, cpu_T0); + tcg_gen_ext32u_i64(cpu_bndl[reg], cpu_bndu[reg]); + tcg_gen_shri_i64(cpu_bndu[reg], cpu_bndu[reg], 32); + } + gen_set_hflag(s, HF_MPX_IU_MASK); } } gen_nop_modrm(env, s, modrm); @@ -7582,6 +7612,33 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, s->mem_index, MO_LEUL); } } + } else if (mod != 3) { + /* bndstx */ + AddressParts a = gen_lea_modrm_0(env, s, modrm); + if (reg >= 4 + || (prefixes & PREFIX_LOCK) + || s->aflag == MO_16 + || a.base < -1) { + goto illegal_op; + } + if (a.base >= 0) { + tcg_gen_addi_tl(cpu_A0, cpu_regs[a.base], a.disp); + } else { + tcg_gen_movi_tl(cpu_A0, 0); + } + gen_lea_v_seg(s, s->aflag, cpu_A0, a.def_seg, s->override); + if (a.index >= 0) { + tcg_gen_mov_tl(cpu_T0, cpu_regs[a.index]); + } else { + tcg_gen_movi_tl(cpu_T0, 0); + } + if (CODE64(s)) { + gen_helper_bndstx64(cpu_env, cpu_A0, cpu_T0, + cpu_bndl[reg], cpu_bndu[reg]); + } else { + gen_helper_bndstx32(cpu_env, cpu_A0, cpu_T0, + cpu_bndl[reg], cpu_bndu[reg]); + } } } gen_nop_modrm(env, s, modrm);