From patchwork Tue Feb 9 17:43:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 8264441 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 CAF13BEEE5 for ; Tue, 9 Feb 2016 17:47:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A5BF201B4 for ; Tue, 9 Feb 2016 17:47:14 +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 53AAB20154 for ; Tue, 9 Feb 2016 17:47:13 +0000 (UTC) Received: from localhost ([::1]:58853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCNc-0002MJ-Kk for patchwork-qemu-devel@patchwork.kernel.org; Tue, 09 Feb 2016 12:47:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCLX-0007cU-Q8 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTCLW-0000np-KL for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:03 -0500 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]:33972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTCLW-0000ni-55 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 12:45:02 -0500 Received: by mail-pa0-x241.google.com with SMTP id yy13so7258595pab.1 for ; Tue, 09 Feb 2016 09:45:01 -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=nFEljBzeDMZi4cqp4UxyJXG+kBz6tChB2uSIcp+zfcs=; b=plxT0r7MJfFgVywGusjIW5omDBcQ4AOuCrtk1YBT/INtTAqe9e7e8TIyoLF9OjXZq3 dc7y/TJGldNTtNK3K51IpBKLNg3+uuNtEeks+CC3iR+n4EkWoeY01fvQexncdVEOe3xf nD2BDEQspTzclVs0y1wtfLh+fXr30Jwbhjh6zEXMCf3ua/Xb/vlzBbdLQdIqfaHszDo8 Kf7mQyIq1wdZGmoxa4E0414zqPktI6I6gXxMjlxXlNzDE/dHvofBQcKHzayeeY7IIVnK El583Q3XR/ek1uMAujCgTurwF8RxX1tD1321Snb5CPQ3FkvAYzaBluYYCsGqFGXriT/I C2rQ== 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=nFEljBzeDMZi4cqp4UxyJXG+kBz6tChB2uSIcp+zfcs=; b=L2ciOvZA1/johRKy2yhr9YfVaQLl6XzkasvUNnzvKig+Q1ax+qWs9k6jAUMcAVmdLa OZ1fy0cFdzEdLplEI1mYLAqh7fF0w0Dx9nzNgqmg2xR3xgY+Y2LtHFCH0jjyKkg1olPi T1fXwI8nZiUw6/7drJHk5SGMwf8cpH/iSE5gLlAP6Y5RXK01YZadHDeC8CiFHF4NE2Bi iUQnQDG+S0+OZmnmbdhL+cszhzOCFqlLUwvQEEyeYf6XdNpAiTGH274a8orber5ItxaW BdbxATLUxpQFo5NRN24QWeOeM6gDrWPY5uBOIAldd8bIN6BL+JJMuJbBcXPENm0sMRjz wz5w== X-Gm-Message-State: AG10YOSIu6DnnjC3xzaIoNN9jiB9LubTFeBknMcpLsRypwmWtQiC7F42VjXUrL5QV/FUHA== X-Received: by 10.66.101.36 with SMTP id fd4mr53065468pab.76.1455039901494; Tue, 09 Feb 2016 09:45:01 -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.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 09:45:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 10 Feb 2016 04:43:46 +1100 Message-Id: <1455039832-9133-11-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:c03::241 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 10/16] target-i386: Implement BNDMOV 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/translate.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 3baf735..8e5172b 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7436,6 +7436,47 @@ static target_ulong disas_insn(CPUX86State *env, DisasContext *s, break; } break; + case 0x11a: + modrm = cpu_ldub_code(env, s->pc++); + if (s->flags & HF_MPX_EN_MASK) { + mod = (modrm >> 6) & 3; + reg = ((modrm >> 3) & 7) | rex_r; + if (prefixes & PREFIX_DATA) { + /* bndmov -- from reg/mem */ + if (reg >= 4 || s->aflag == MO_16) { + goto illegal_op; + } + if (mod == 3) { + int reg2 = (modrm & 7) | REX_B(s); + if (reg2 >= 4 || (prefixes & PREFIX_LOCK)) { + goto illegal_op; + } + if (s->flags & HF_MPX_IU_MASK) { + tcg_gen_mov_i64(cpu_bndl[reg], cpu_bndl[reg2]); + tcg_gen_mov_i64(cpu_bndu[reg], cpu_bndu[reg2]); + } + } else { + gen_lea_modrm(env, s, modrm); + if (CODE64(s)) { + tcg_gen_qemu_ld_i64(cpu_bndl[reg], cpu_A0, + s->mem_index, MO_LEQ); + tcg_gen_addi_tl(cpu_A0, cpu_A0, 8); + tcg_gen_qemu_ld_i64(cpu_bndu[reg], cpu_A0, + s->mem_index, MO_LEQ); + } else { + tcg_gen_qemu_ld_i64(cpu_bndl[reg], cpu_A0, + s->mem_index, MO_LEUL); + tcg_gen_addi_tl(cpu_A0, cpu_A0, 4); + tcg_gen_qemu_ld_i64(cpu_bndu[reg], cpu_A0, + s->mem_index, MO_LEUL); + } + /* bnd registers are now in-use */ + gen_set_hflag(s, HF_MPX_IU_MASK); + } + } + } + gen_nop_modrm(env, s, modrm); + break; case 0x11b: modrm = cpu_ldub_code(env, s->pc++); if (s->flags & HF_MPX_EN_MASK) { @@ -7469,11 +7510,41 @@ 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_DATA) { + /* bndmov -- to reg/mem */ + if (reg >= 4 || s->aflag == MO_16) { + goto illegal_op; + } + if (mod == 3) { + int reg2 = (modrm & 7) | REX_B(s); + if (reg2 >= 4 || (prefixes & PREFIX_LOCK)) { + goto illegal_op; + } + if (s->flags & HF_MPX_IU_MASK) { + tcg_gen_mov_i64(cpu_bndl[reg2], cpu_bndl[reg]); + tcg_gen_mov_i64(cpu_bndu[reg2], cpu_bndu[reg]); + } + } else { + gen_lea_modrm(env, s, modrm); + if (CODE64(s)) { + tcg_gen_qemu_st_i64(cpu_bndl[reg], cpu_A0, + s->mem_index, MO_LEQ); + tcg_gen_addi_tl(cpu_A0, cpu_A0, 8); + tcg_gen_qemu_st_i64(cpu_bndu[reg], cpu_A0, + s->mem_index, MO_LEQ); + } else { + tcg_gen_qemu_st_i64(cpu_bndl[reg], cpu_A0, + s->mem_index, MO_LEUL); + tcg_gen_addi_tl(cpu_A0, cpu_A0, 4); + tcg_gen_qemu_st_i64(cpu_bndu[reg], cpu_A0, + s->mem_index, MO_LEUL); + } + } } } gen_nop_modrm(env, s, modrm); break; - case 0x119: case 0x11a: case 0x11c ... 0x11f: /* nop (multi byte) */ + case 0x119: case 0x11c ... 0x11f: /* nop (multi byte) */ modrm = cpu_ldub_code(env, s->pc++); gen_nop_modrm(env, s, modrm); break;