From patchwork Thu Sep 27 22:40:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187577 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 DDD9F2C00A2 for ; Fri, 28 Sep 2012 09:54:12 +1000 (EST) Received: from localhost ([::1]:38894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlf-0004PC-Cj for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 18:41:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlC-0004D3-7v for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THMlA-0003OK-Uj for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:46 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:50380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlA-000340-KX for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:44 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so4262225pbb.4 for ; Thu, 27 Sep 2012 15:40:44 -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=6BUzkQcsGb6Z4FPL4C4gAu2p/yvqxldqjR7koavVU+w=; b=PxgFNOGiy5+WxZU0MrtAXumrA2iwnGJuzS7RrRmBAPCIqt7EwVNjUJApbYu4qihxcC rvFjUmhoe9MWy/uHkmc72bJvXakLXRwt8f2pUpkh0rhRhmM7yAXEpDtLMEf7BgOP0Lr6 TpX/HXbwIpb33h9pJoCCA36GH+6zkmXoFRO4wv7foDFUWtpBiusj4omLFys0osmeGeKm 4TB/yq7H39oHHjMqOziY5FEMzSXSEF1IOt2rPllSy2YFDqC+sYvpsEW9bjCXy3FXqeSk rOyBxyvWN7crZUwmJ3kBE3TvpA4VYqcp1+nJkgUqJxyVXjqZsHG5vTq3P03B2N7yvqyL TLoQ== Received: by 10.68.200.227 with SMTP id jv3mr15071175pbc.162.1348785644254; Thu, 27 Sep 2012 15:40:44 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id sj5sm4480267pbc.30.2012.09.27.15.40.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 15:40:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 15:40:06 -0700 Message-Id: <1348785610-23418-26-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 025/147] target-s390: Convert LOAD ADDRESS 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 | 5 +++++ target-s390x/translate.c | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/target-s390x/insn-data.def b/target-s390x/insn-data.def index 0a7cba3..f0dcea6 100644 --- a/target-s390x/insn-data.def +++ b/target-s390x/insn-data.def @@ -121,6 +121,11 @@ C(0xc40d, LRL, RIL_b, GIE, 0, ri2, new, r1_32, ld32s, 0) C(0xc408, LGRL, RIL_b, GIE, 0, ri2, r1, 0, ld64, 0) C(0xc40c, LGFRL, RIL_b, GIE, 0, ri2, r1, 0, ld32s, 0) +/* LOAD ADDRESS */ + C(0x4100, LA, RX_a, Z, 0, a2, 0, r1, mov2, 0) + C(0xe371, LAY, RXY_a, LD, 0, a2, 0, r1, mov2, 0) +/* LOAD ADDRESS RELATIVE LONG */ + C(0xc000, LARL, RIL_b, Z, 0, ri2, 0, r1, mov2, 0) /* LOAD LOGICAL */ C(0xb916, LLGFR, RRE, Z, 0, r2_32u, 0, r1, mov2, 0) C(0xe316, LLGF, RXY_a, Z, 0, a2, r1, 0, ld32u, 0) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index b6744b2..a06d5fd 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -1444,9 +1444,6 @@ static void disas_e3(CPUS390XState *env, DisasContext* s, int op, int r1, tcg_gen_qemu_st32(tmp2, addr, get_mem_index(s)); tcg_temp_free_i64(tmp2); break; - case 0x71: /* LAY R1,D2(X2,B2) [RXY] */ - store_reg(r1, addr); - break; case 0x72: /* STCY R1,D2(X2,B2) [RXY] */ tmp32_1 = load_reg32(r1); tmp2 = tcg_temp_new_i64(); @@ -3094,11 +3091,6 @@ static void disas_c0(CPUS390XState *env, DisasContext *s, int op, int r1, int i2 LOG_DISAS("disas_c0: op 0x%x r1 %d i2 %d\n", op, r1, i2); switch (op) { - case 0: /* larl r1, i2 */ - tmp = tcg_const_i64(target); - store_reg(r1, tmp); - tcg_temp_free_i64(tmp); - break; case 0x4: /* BRCL M1,I2 [RIL] */ if (r1 == 15) { /* m1 == r1 */ gen_goto_tb(s, 0, target); @@ -3376,12 +3368,6 @@ static void disas_s390_insn(CPUS390XState *env, DisasContext *s) tcg_temp_free_i64(tmp); tcg_temp_free_i64(tmp2); break; - case 0x41: /* la */ - insn = ld_code4(env, s->pc); - tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2); - store_reg(r1, tmp); /* FIXME: 31/24-bit addressing */ - tcg_temp_free_i64(tmp); - break; case 0x42: /* STC R1,D2(X2,B2) [RX] */ insn = ld_code4(env, s->pc); tmp = decode_rx(s, insn, &r1, &x2, &b2, &d2);