From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:56304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNKV-0000ET-9i for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THNKU-00073E-BP for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:17:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:55721) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNKU-000737-4u for qemu-devel@nongnu.org; Thu, 27 Sep 2012 19:17:14 -0400 Received: by pbbrp2 with SMTP id rp2so4294968pbb.4 for ; Thu, 27 Sep 2012 16:17:13 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 27 Sep 2012 16:17:10 -0700 Message-Id: <1348787830-24202-1-git-send-email-rth@twiddle.net> In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 039/147] target-s390: Convert SET ADDRESSING MODE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf Signed-off-by: Richard Henderson --- target-s390x/insn-data.def | 7 +++++++ target-s390x/translate.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index f70ede9..69af25d 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -344,3 +344,10 @@ D(0xa703, TMHL, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 32) D(0xa700, TMLH, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 16) D(0xa701, TMLL, RI_a, Z, r1_o, i2_16u_shl, 0, 0, 0, tm64, 0) + +#ifndef CONFIG_USER_ONLY +/* SET ADDRESSING MODE */ + /* We only do 64-bit, so accept this as a no-op. + Let SAM24 and SAM31 signal illegal instruction. */ + C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0) +#endif /* CONFIG_USER_ONLY */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index ec18aeb..5b64959 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2371,12 +2371,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { -#ifndef CONFIG_USER_ONLY - case 0x01: /* SAM */ - insn = ld_code2(env, s->pc); - /* set addressing mode, but we only do 64bit anyways */ - break; -#endif case 0xa: /* SVC I [RR] */ insn = ld_code2(env, s->pc); debug_insn(insn); -- 1.7.11.4