From patchwork Fri Sep 28 00:38:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187626 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 E2F122C00B9 for ; Fri, 28 Sep 2012 10:38:21 +1000 (EST) Received: from localhost ([::1]:36897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOax-0000Sf-Vs for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 20:38:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57585) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOap-0000S6-CB for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:38:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THOao-0008Un-9U for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:38:11 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:38420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THOao-0008Ug-33 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 20:38:10 -0400 Received: by pbbrp2 with SMTP id rp2so4366677pbb.4 for ; Thu, 27 Sep 2012 17:38:07 -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=6KLA1+nDewF7S87/AGDsaShpEKuvFgVDZ8yvVrnMubw=; b=GSoN60225PrriCUadLRVls8JyFH7NpvJ1gfaST2O7Urv2iH/BT3VeVplsyIcOX2u3g jiRGRHttRvWcxaxVneFIQL202Sccull1bK7Vs7OE6getwhEq2GxOPfT9Y/iThMJArw8K Y7XqSsS0eHlv4smbxD5onONF6VulIxkG+qPT4K1DNxs/di+JOZfv59laQulLfHBsSgOI PRbMlAMV8tfclhBw86Elt9eonlZTon+nuP9FuucWYvqic+U8mA1mVX1M40Z8zNLuaER0 y0R/lGwjr2fzPZexNNhndKfo032yzFo2HkCWbtWm1hj0F3v0KN/S2odwkHFc5kqMKDs4 z/bQ== Received: by 10.66.86.201 with SMTP id r9mr13476244paz.16.1348792687920; Thu, 27 Sep 2012 17:38:07 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id y11sm4617200pbv.66.2012.09.27.17.38.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 17:38:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 17:38:04 -0700 Message-Id: <1348792684-27140-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 103/147] target-s390: Convert STAP 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 | 24 ++++++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 87a77a2..f68e586 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -658,6 +658,8 @@ /* STORE CONTROL */ C(0xb600, STCTL, RS_a, Z, 0, a2, 0, 0, stctl, 0) C(0xeb25, STCTG, RSY_a, Z, 0, a2, 0, 0, stctg, 0) +/* STORE CPU ADDRESS */ + C(0xb212, STAP, S, Z, la2, 0, new, m1_16, stap, 0) /* STORE CPU ID */ C(0xb202, STIDP, S, Z, la2, 0, new, m1_64, stidp, 0) /* STORE CPU TIMER */ diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 36fbb1d..fd58524 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1033,20 +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 0x12: /* STAP D2(B2) [S] */ - /* Store CPU Address */ - check_privileged(s); - decode_rs(s, insn, &r1, &r3, &b2, &d2); - tmp = get_address(s, 0, b2, d2); - tmp2 = tcg_temp_new_i64(); - tmp32_1 = tcg_temp_new_i32(); - tcg_gen_ld_i32(tmp32_1, cpu_env, offsetof(CPUS390XState, cpu_num)); - tcg_gen_extu_i32_i64(tmp2, tmp32_1); - tcg_gen_qemu_st32(tmp2, tmp, get_mem_index(s)); - tcg_temp_free_i64(tmp); - tcg_temp_free_i64(tmp2); - tcg_temp_free_i32(tmp32_1); - break; case 0x21: /* IPTE R1,R2 [RRE] */ /* Invalidate PTE */ check_privileged(s); @@ -2859,6 +2845,16 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o) return NO_EXIT; } +static ExitStatus op_stap(DisasContext *s, DisasOps *o) +{ + check_privileged(s); + /* ??? Surely cpu address != cpu number. In any case the previous + version of this stored more than the required half-word, so it + is unlikely this has ever been tested. */ + tcg_gen_ld32u_i64(o->out, cpu_env, offsetof(CPUS390XState, cpu_num)); + return NO_EXIT; +} + static ExitStatus op_stck(DisasContext *s, DisasOps *o) { gen_helper_stck(o->out, cpu_env);