From patchwork Mon Feb 15 11:23:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8313741 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 547879F6E4 for ; Mon, 15 Feb 2016 11:30:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7EC47202F2 for ; Mon, 15 Feb 2016 11:30:04 +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 61ADD2028D for ; Mon, 15 Feb 2016 11:30:03 +0000 (UTC) Received: from localhost ([::1]:59301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVHLu-0008T4-Nm for patchwork-qemu-devel@patchwork.kernel.org; Mon, 15 Feb 2016 06:30:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVHGc-0000HK-CD for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:24:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aVHGZ-0002zY-3z for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:24:34 -0500 Received: from mail-qg0-x22f.google.com ([2607:f8b0:400d:c04::22f]:36461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aVHGY-0002zU-Uy for qemu-devel@nongnu.org; Mon, 15 Feb 2016 06:24:31 -0500 Received: by mail-qg0-x22f.google.com with SMTP id y9so108855709qgd.3 for ; Mon, 15 Feb 2016 03:24:30 -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=7YQVufEeAUuyqToYU6gl+AqkVUkI+QSSnKFoZQdQPAU=; b=MhgjkT3Vp6ya4SAbqbCwbcF69Q3IaBREmxX3I7LusWqTO35kGuZzOMhy5dZ+qwrJbu nXfx80xTNHekSyUeeekT2dBaudirFWKBYNGupQ0Kop6MwzchUMU2nrH17y/PVzyJJMF+ a8qqUMgMGSlBTnXxgcKlUEKE2WMGZAAfRr0QpirgmmL1WNqNyMQH4UWsRTaH8lHULi12 RjblVlKRXdawvCXdCcNurubu4Mw/xsaPXxEr/PL6y5bzrojeu+c6d2talU8So7+FIrVX QWliH9kvVgCOricr0akinIIS8/iG/bTsxJ0xr46iNn1aDwhPukkjCs2+w7yMZk1w9xvA BgQQ== 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=7YQVufEeAUuyqToYU6gl+AqkVUkI+QSSnKFoZQdQPAU=; b=S+TBAJ+AAHAI6KkWzp8dyk1ttB+Y6M1ZYc7ac4XrqIRKCkp9lY7UIAP8VciREfC0AI ksA+hwSoxHNxzGeZu228pWvVkUEBb5om5heCUzzZugQjeYVt/kyIHzTpk2SkZIvgNVCN 2H0k6tZToRKrIvX5CaRoaBDUQzoW9Aaet4TEyPBMuz9Ioc7wjeKXbZsLDwyuvBuUXyEP DZZAEHsvvV2MP5HxHRHaRPt6kxjrwQUZXKlGK1VrKw2890tyruYg2SgL+4d7SkkJlkSv O1kBouMuyYCY90PWk0zTWB/wQXl94UrjVPyL1RR0Fw2EpTNNaxCVHFgUuurUtT6YMTRY 6QDg== X-Gm-Message-State: AG10YORet9mMegulqSpJbYHoXKvryS707mAuvqYHAcdk5Lf/sCslNMqXyPPxEfB9PzqC4Q== X-Received: by 10.140.100.141 with SMTP id s13mr19205413qge.25.1455535470729; Mon, 15 Feb 2016 03:24:30 -0800 (PST) Received: from bigtime.com ([103.226.32.154]) by smtp.gmail.com with ESMTPSA id 191sm10824296qhq.17.2016.02.15.03.24.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2016 03:24:30 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 15 Feb 2016 22:23:23 +1100 Message-Id: <1455535408-26566-12-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455535408-26566-1-git-send-email-rth@twiddle.net> References: <1455535408-26566-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:400d:c04::22f Cc: peter.maydell@linaro.org, pbonzini@redhat.com Subject: [Qemu-devel] [PULL 11/16] target-i386: Implement BNDCL, BNDCU, BNDCN 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 | 2 ++ target-i386/mpx_helper.c | 8 ++++++++ target-i386/translate.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 53 insertions(+), 1 deletion(-) diff --git a/target-i386/helper.h b/target-i386/helper.h index 14a5041..e40216b 100644 --- a/target-i386/helper.h +++ b/target-i386/helper.h @@ -16,6 +16,8 @@ DEF_HELPER_2(divq_EAX, void, env, tl) DEF_HELPER_2(idivq_EAX, void, env, tl) #endif +DEF_HELPER_FLAGS_2(bndck, TCG_CALL_NO_WG, void, env, i32) + DEF_HELPER_2(aam, void, env, int) DEF_HELPER_2(aad, void, env, int) DEF_HELPER_1(aaa, void, env) diff --git a/target-i386/mpx_helper.c b/target-i386/mpx_helper.c index 578b978..e4d5aba 100644 --- a/target-i386/mpx_helper.c +++ b/target-i386/mpx_helper.c @@ -51,3 +51,11 @@ void cpu_sync_bndcs_hflags(CPUX86State *env) env->hflags = hflags; env->hflags2 = hflags2; } + +void helper_bndck(CPUX86State *env, uint32_t fail) +{ + if (unlikely(fail)) { + env->bndcs_regs.sts = 1; + raise_exception_ra(env, EXCP05_BOUND, GETPC()); + } +} diff --git a/target-i386/translate.c b/target-i386/translate.c index 1ac245b..803424c 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -1989,6 +1989,21 @@ static void gen_nop_modrm(CPUX86State *env, DisasContext *s, int modrm) (void)gen_lea_modrm_0(env, s, modrm); } +/* Used for BNDCL, BNDCU, BNDCN. */ +static void gen_bndck(CPUX86State *env, DisasContext *s, int modrm, + TCGCond cond, TCGv_i64 bndv) +{ + TCGv ea = gen_lea_modrm_1(gen_lea_modrm_0(env, s, modrm)); + + tcg_gen_extu_tl_i64(cpu_tmp1_i64, ea); + if (!CODE64(s)) { + tcg_gen_ext32u_i64(cpu_tmp1_i64, cpu_tmp1_i64); + } + tcg_gen_setcond_i64(cond, cpu_tmp1_i64, cpu_tmp1_i64, bndv); + tcg_gen_extrl_i64_i32(cpu_tmp2_i32, cpu_tmp1_i64); + gen_helper_bndck(cpu_env, cpu_tmp2_i32); +} + /* used for LEA and MOV AX, mem */ static void gen_add_A0_ds_seg(DisasContext *s) { @@ -7445,7 +7460,26 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, if (s->flags & HF_MPX_EN_MASK) { mod = (modrm >> 6) & 3; reg = ((modrm >> 3) & 7) | rex_r; - if (prefixes & PREFIX_DATA) { + if (prefixes & PREFIX_REPZ) { + /* bndcl */ + if (reg >= 4 + || (prefixes & PREFIX_LOCK) + || s->aflag == MO_16) { + goto illegal_op; + } + gen_bndck(env, s, modrm, TCG_COND_LTU, cpu_bndl[reg]); + } else if (prefixes & PREFIX_REPNZ) { + /* bndcu */ + if (reg >= 4 + || (prefixes & PREFIX_LOCK) + || s->aflag == MO_16) { + goto illegal_op; + } + TCGv_i64 notu = tcg_temp_new_i64(); + tcg_gen_not_i64(notu, cpu_bndu[reg]); + gen_bndck(env, s, modrm, TCG_COND_GTU, notu); + tcg_temp_free_i64(notu); + } else if (prefixes & PREFIX_DATA) { /* bndmov -- from reg/mem */ if (reg >= 4 || s->aflag == MO_16) { goto illegal_op; @@ -7514,6 +7548,14 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, /* bnd registers are now in-use */ gen_set_hflag(s, HF_MPX_IU_MASK); break; + } else if (prefixes & PREFIX_REPNZ) { + /* bndcn */ + if (reg >= 4 + || (prefixes & PREFIX_LOCK) + || s->aflag == MO_16) { + goto illegal_op; + } + gen_bndck(env, s, modrm, TCG_COND_GTU, cpu_bndu[reg]); } else if (prefixes & PREFIX_DATA) { /* bndmov -- to reg/mem */ if (reg >= 4 || s->aflag == MO_16) {