From patchwork Fri Sep 28 00:47:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187635 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 6F5702C00A9 for ; Fri, 28 Sep 2012 10:47:53 +1000 (EST) Received: from localhost ([::1]:50030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOkB-0008T9-Ln for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:47:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOk4-0008St-Bz for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOk3-0003Ke-9Y for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:47:44 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:59046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOk3-0003KZ-3W for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:47:43 -0400 Received: by padfb10 with SMTP id fb10so1804203pad.4 for ; Thu, 27 Sep 2012 17:47:42 -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=JKTlSe8jToQ7W/bjiF6cLcTHqKJH45SVChbNJMRpJYU=; b=quezDlNHdokCHNn1SlHYBzsj1EsKoB3Xh2LP89Pqw+8a9aUZM0ORCgC93HUS53+wUU U2zGoJ6ewhQYASKbaoSl1E7RByoUbX1ThVwG17rr4lITSU3QA0w5lEQGZSDNzzk8VyN7 qP/wzzQA/hxO/XQo78i4iyhBxyNf504b2zYK5VjhQIq9WW8RMLDEt3H5lwKMnl9wp38K SDdPucltcgx88Le64HzBrNq8RGdjFooOGToI8MYQrywRBqoQVw3Ng47+eW1t8jPA98aU O0wJSeOOP4MoJvMMJ/ao8RhZ8n8OvlocY3XfQhC1MwY3aJhwqpIYMqD6q+qydBHuAI4T Xw9A== Received: by 10.66.83.8 with SMTP id m8mr13494339pay.48.1348793262333; Thu, 27 Sep 2012 17:47:42 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id oj2sm4266945pbb.26.2012.09.27.17.47.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:47:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:47:38 -0700 Message-Id: <1348793258-27530-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.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 112/147] target-s390: Convert SACF 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 | 2 ++ target-s390x/translate.c | 21 ++++++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 75729fe..a389f15 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -643,6 +643,8 @@ /* 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) +/* SET ADDRESS SPACE CONTROL FAST */ + C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0) /* SET CLOCK */ /* ??? Not implemented - is it necessary? */ C(0xb204, SCK, S, Z, 0, 0, 0, 0, 0, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 9b664aa..b29e2ea 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,19 +1033,6 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x79: /* SACF D2(B2) [S] */ - /* Set Address Space Control Fast */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_sacf(cpu_env, tmp); - tcg_temp_free_i64(tmp); - /* addressing mode has changed, so end the block */ - s->pc = s->next_pc; - update_psw_addr(s); - s->is_jmp = DISAS_JUMP; - break; case 0x7d: /* STSI D2,(B2) [S] */ check_privileged(s); decode_rs(s, insn, &r1, &r3, &b2, &d2); @@ -2681,6 +2668,14 @@ static ExitStatus op_rrbe(DisasContext *s, DisasOps *o) set_cc_static(s); return NO_EXIT; } + +static ExitStatus op_sacf(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_sacf(cpu_env, o->in2); + /* Addressing mode has changed, so end the block. */ + return EXIT_PC_STALE; +} #endif static ExitStatus op_sar(DisasContext *s, DisasOps *o)