From patchwork Sun Sep 9 21:04:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182701 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 8A4362C009F for ; Mon, 10 Sep 2012 08:37:32 +1000 (EST) Received: from localhost ([::1]:53836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAokH-0001AC-Ij for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 17:08:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoic-0007MO-K0 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAoib-0005ym-C7 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:02 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:59699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAoib-0005pQ-5L for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:01 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so291958pbb.4 for ; Sun, 09 Sep 2012 14:07:00 -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=tfMR58EN2gms5odNtgtlcjZ3sP56cr2H8WKGO0y4Iq8=; b=SJ77SYFphSUanfvTCFHlL6sNpEHlCqrxsfyqLc6t+P5XD/89nv3T/cj8cjHxZ76dhi nkHkgZX/l8LV50Z0a3WdN7B6licvJTLvlSyzEvydsxorNKsAnGVOsbAvgmOKxxr+RRfF /49psPqJvg/kPnrF0DPafx2vq4O7RHBkfd27lZCjiNoSNu3v7qBfuGhvzIC5PYwd308F oUu5MOfce2Bgkg0UtzwhFCAwUhndJDTPgQ42GhXkwsPiteihfmyRSKm9yVEJktwLY0G4 52uuITZf4odHBVEQ1hGRnmH1w7jbybdJyVVSO90ahyqeZgDKXAYqqMwRefUJPHRAsNA0 Uqgg== Received: by 10.68.236.200 with SMTP id uw8mr2036435pbc.94.1347224820923; Sun, 09 Sep 2012 14:07:00 -0700 (PDT) Received: from anchor.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id tw5sm662053pbc.48.2012.09.09.14.07.00 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:04:50 -0700 Message-Id: <1347224784-19472-33-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1347224784-19472-1-git-send-email-rth@twiddle.net> References: <1347224784-19472-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 032/126] 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 845d22c..267050f 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 34513d5..ccba739 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2364,12 +2364,6 @@ static void disas_s390_insn(DisasContext *s) LOG_DISAS("opc 0x%x\n", opc); switch (opc) { -#ifndef CONFIG_USER_ONLY - case 0x01: /* SAM */ - insn = ld_code2(s->pc); - /* set addressing mode, but we only do 64bit anyways */ - break; -#endif case 0xa: /* SVC I [RR] */ insn = ld_code2(s->pc); debug_insn(insn);