From patchwork Sun Sep 9 21:05:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 182685 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 9CED02C008A for ; Mon, 10 Sep 2012 08:17:20 +1000 (EST) Received: from localhost ([::1]:50848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TApoc-0006ug-KE for incoming@patchwork.ozlabs.org; Sun, 09 Sep 2012 18:17:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojW-0000K3-2s for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TAojU-0006HL-Ad for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:57 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:63059) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TAojU-0005pO-58 for qemu-devel@nongnu.org; Sun, 09 Sep 2012 17:07:56 -0400 Received: by mail-pz0-f45.google.com with SMTP id n15so968311dad.4 for ; Sun, 09 Sep 2012 14:07:55 -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=vw+X6yLv0Y5NuSibFhw/sNxnXEU2b/uyOV3DURRaVnU=; b=Zr6T28B3utCfiPT/WwaQEjcGYrCFAFWaH0WnULz2EXJuci/oYkyoRDjg0beCIp3Hkp fm6kYj9wAe64ZAfHOa53HvQDFYXuEjXIEzbLoOIXAjs0MdSqDbphr7z50yFHaWW6XZk8 ZjefJ8WQoCjKfyUrfZg8r0HYpDL5L9cSK5o1F/m9Q8wTVuacUoxqFRVw/+7/qwpaWaVP PPFrNSXLR9UAmoImVgdynnMqfllqlVijrJrEP4kIMfizaILI0o0HG+BUYz54snKtXKmB f9LOJdZZGR8hjnhozPCLFIilt5GF+02gsyZVBi40SoDlV54R65WDyVeXMtQLNF9gNaTA 2cww== Received: by 10.66.85.71 with SMTP id f7mr18282258paz.5.1347224875904; Sun, 09 Sep 2012 14:07:55 -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.55 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 09 Sep 2012 14:07:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 9 Sep 2012 14:05:53 -0700 Message-Id: <1347224784-19472-96-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.210.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 095/126] target-s390: Convert SPX, STPX 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 | 4 ++++ target-s390x/misc_helper.c | 6 ++---- target-s390x/translate.c | 35 +++++++++++++++-------------------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 58f2b41..63da5ab 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -642,6 +642,8 @@ C(0xb206, SCKC, S, Z, 0, m2_64, 0, 0, sckc, 0) /* SET CPU TIMER */ C(0xb208, SPT, S, Z, 0, m2_64, 0, 0, spt, 0) +/* SET PREFIX */ + C(0xb210, SPX, S, Z, 0, m2_32u, 0, 0, spx, 0) /* SET PSW KEY FROM ADDRESS */ C(0xb20a, SPKA, S, Z, 0, a2, 0, 0, spka, 0) /* SET SYSTEM MASK */ @@ -660,6 +662,8 @@ C(0xb202, STIDP, S, Z, la2, 0, new, m1_64, stidp, 0) /* STORE CPU TIMER */ C(0xb209, STPT, S, Z, la2, 0, new, m1_64, stpt, 0) +/* STORE PREFIX */ + C(0xb211, STPX, S, Z, la2, 0, new, m1_32, stpx, 0) /* STORE THEN AND SYSTEM MASK */ C(0xac00, STNSM, SI, Z, la1, 0, new, m1_8, stnsm, 0) /* STORE THEN OR SYSTEM MASK */ diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c index d205259..e604613 100644 --- a/target-s390x/misc_helper.c +++ b/target-s390x/misc_helper.c @@ -733,10 +733,8 @@ uint64_t HELPER(diag)(CPUS390XState *env, uint32_t num, uint64_t mem, /* Set Prefix */ void HELPER(spx)(CPUS390XState *env, uint64_t a1) { - uint32_t prefix; - - prefix = cpu_ldl_data(env, a1); - env->psa = prefix & 0xfffff000; + uint32_t prefix = a1 & 0x7fffe000; + env->psa = prefix; qemu_log("prefix: %#x\n", prefix); tlb_flush_page(env, 0); tlb_flush_page(env, TARGET_PAGE_SIZE); diff --git a/target-s390x/translate.c b/target-s390x/translate.c index f3108f3..6b60de1 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1030,26 +1030,6 @@ static void disas_b2(DisasContext *s, int op, uint32_t insn) LOG_DISAS("disas_b2: op 0x%x r1 %d r2 %d\n", op, r1, r2); switch (op) { - case 0x10: /* SPX D2(B2) [S] */ - /* Set Prefix Register */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - potential_page_fault(s); - gen_helper_spx(cpu_env, tmp); - tcg_temp_free_i64(tmp); - break; - case 0x11: /* STPX D2(B2) [S] */ - /* Store Prefix */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp2 = tcg_temp_new_i64(); - tcg_gen_ld_i64(tmp2, cpu_env, offsetof(CPUS390XState, psa)); - tcg_gen_qemu_st32(tmp2, tmp, get_mem_index(s)); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - break; case 0x12: /* STAP D2(B2) [S] */ /* Store CPU Address */ check_privileged(s); @@ -2885,6 +2865,21 @@ static ExitStatus op_stpt(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_spx(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + gen_helper_spx(cpu_env, o->in2); + return NO_EXIT; +} + +static ExitStatus op_stpx(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + tcg_gen_ld_i64(o->out, cpu_env, offsetof(CPUS390XState, psa)); + tcg_gen_andi_i64(o->out, o->out, 0x7fffe000); + return NO_EXIT; +} + static ExitStatus op_stnsm(DisasContext *s, DisasOps *o) { uint64_t i2 = get_field(s->fields, i2);