From patchwork Thu Sep 27 23:17:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187543 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AF9FF2C00B6 for ; Fri, 28 Sep 2012 09:17:24 +1000 (EST) Received: from localhost ([::1]:47037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THNKc-0000Eu-Ni for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 19:17:22 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=XEYrkdhfQP60o5pTOi6Z2fg2HaF+Wy4HYWW2uif4bNM=; b=wa754WpZeCMGpWL4WpJTFAfwRgdgDnL/cngOYz8ChRYAfJWayZ3BCkKu+JhWSzS0Tk 1B8imkhUFxHkVUCmHJul093UTB3efVF/u6no3BStinvem1+qFoC91fCe387CuJeCxD8A 5yLrtxRlX4pCygFKbtZIWSOz7cf8lAeA199pWfcohZLnc859yF1wPTfzbt8Z4VINdbq2 3HkAZjn1b3bTzh8mKFajOjAHuYrCypSKAQ3UiMokSb7j1VU3OkM3x7tOBGrXdK0dyEVo o7wdm4gl7to5Zo9N9NKmrBTYNhjmq0gC5ICntgmUpVpAFdiNIicEgQnRCGt9/OXjR0p5 f62A== Received: by 10.68.131.2 with SMTP id oi2mr15507087pbb.78.1348787833540; Thu, 27 Sep 2012 16:17:13 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id e9sm4413959pay.34.2012.09.27.16.17.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 16:17:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 16:17:10 -0700 Message-Id: <1348787830-24202-1-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 039/147] target-s390: Convert SET ADDRESSING MODE 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);