From patchwork Tue Oct 1 17:17:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 279536 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74B4E2C0092 for ; Wed, 2 Oct 2013 03:20:20 +1000 (EST) Received: from localhost ([::1]:60288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3cQ-0007Ai-91 for incoming@patchwork.ozlabs.org; Tue, 01 Oct 2013 13:20:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aO-0004FW-77 for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VR3aI-0000E7-DI for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:12 -0400 Received: from mail-qc0-x22d.google.com ([2607:f8b0:400d:c01::22d]:39326) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VR3aI-0000E3-95 for qemu-devel@nongnu.org; Tue, 01 Oct 2013 13:18:06 -0400 Received: by mail-qc0-f173.google.com with SMTP id c3so4965801qcv.18 for ; Tue, 01 Oct 2013 10:18:05 -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:in-reply-to:references; bh=Lb3oI+PmcBdMOUfIVSNKCva0G+xis4EnvFlGfpXvZjs=; b=Peow2jcMbr/qcLbJPHqoIT09vcnVrfxZ2+nmZa318/+BcBVufvS9e3IwDd9CF0MQcc bnOI/+WktWXLplXY3C0k46TobE749Oqrx7b6QIcA54SEoodVLHJdVlIRwbNkHuB0Lg3F EVefzgQO0cxfD3+ueP0SX04rm+83LuQ+n3bir7GoiZJsn1dtgIpAIFaZ7/V5vFr9atvk XX9zhAgmHWg5iQCd2celAZfsJoxsEyCFlOSPohbX61swzNMqHGYl/ea3ssVbwvr04Z50 XtU8RhsmVmX4vxMPMzLoOJA3+2vlb+upK6pEY9sY/YjSlL3nwM/yB/cJGgx4QLF8tLLl A15A== X-Received: by 10.49.132.233 with SMTP id ox9mr37840874qeb.36.1380647885884; Tue, 01 Oct 2013 10:18:05 -0700 (PDT) Received: from anchor.com (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id r5sm14813158qaj.13.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 01 Oct 2013 10:18:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 1 Oct 2013 10:17:19 -0700 Message-Id: <1380647845-16793-4-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1380647845-16793-1-git-send-email-rth@twiddle.net> References: <1380647845-16793-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22d Cc: agraf@suse.de Subject: [Qemu-devel] [PATCH v2 3/9] target-s390: Implement SAM31 and SAM64 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 | 8 ++++---- target-s390x/translate.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 4b462d4..c528eb4 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -566,6 +566,10 @@ /* SET ACCESS */ C(0xb24e, SAR, RRE, Z, 0, r2_o, 0, 0, sar, 0) +/* SET ADDRESSING MODE */ + /* We only do 32 and 64-bit. Let SAM24 signal illegal instruction. */ + C(0x010d, SAM31, E, Z, 0, 0, 0, 0, sam31, 0) + C(0x010e, SAM64, E, Z, 0, 0, 0, 0, sam64, 0) /* SET FPC */ C(0xb384, SFPC, RRE, Z, 0, r1_o, 0, 0, sfpc, 0) /* SET FPC AND SIGNAL */ @@ -745,10 +749,6 @@ C(0xb22a, RRBE, RRE, Z, 0, r2_o, 0, 0, rrbe, 0) /* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */ C(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0) -/* 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) /* SET ADDRESS SPACE CONTROL FAST */ C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0) /* SET CLOCK */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 7356625..f8732bb 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2912,6 +2912,32 @@ static ExitStatus op_sacf(DisasContext *s, DisasOps *o) } #endif +static ExitStatus op_sam31(DisasContext *s, DisasOps *o) +{ + /* Bizzare but true, we check the address of the current insn for the + specification exception, not the next to be executed. Thus the PoO + documents that Bad Things Happen at 0x7ffffffe. */ + if (s->pc & ~0x7ffffff) { + gen_program_exception(s, PGM_SPECIFICATION); + return EXIT_NORETURN; + } + s->next_pc &= 0x7fffffff; + + tcg_gen_andi_i64(psw_mask, psw_mask, ~PSW_MASK_64); + tcg_gen_ori_i64(psw_mask, psw_mask, PSW_MASK_32); + + /* Always exit the TB, since we (may have) changed execution mode. */ + return EXIT_PC_STALE; +} + +static ExitStatus op_sam64(DisasContext *s, DisasOps *o) +{ + tcg_gen_ori_i64(psw_mask, psw_mask, PSW_MASK_32 | PSW_MASK_64); + + /* Always exit the TB, since we (may have) changed execution mode. */ + return EXIT_PC_STALE; +} + static ExitStatus op_sar(DisasContext *s, DisasOps *o) { int r1 = get_field(s->fields, r1);