From patchwork Fri Jun 4 19:14:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 54692 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2152FB7D24 for ; Sat, 5 Jun 2010 05:56:37 +1000 (EST) Received: from localhost ([127.0.0.1]:60655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKd0M-0000Ae-D3 for incoming@patchwork.ozlabs.org; Fri, 04 Jun 2010 15:56:34 -0400 Received: from [140.186.70.92] (port=59114 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OKcOF-00063h-5E for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OKcOD-0002c1-VA for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:10 -0400 Received: from are.twiddle.net ([75.149.56.221]:54806) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OKcOD-0002bs-OW for qemu-devel@nongnu.org; Fri, 04 Jun 2010 15:17:09 -0400 Received: from anchor.twiddle.home (anchor.twiddle.home [172.31.0.4]) by are.twiddle.net (Postfix) with ESMTPS id 1294646D; Fri, 4 Jun 2010 12:17:08 -0700 (PDT) Received: from anchor.twiddle.home (anchor.twiddle.home [127.0.0.1]) by anchor.twiddle.home (8.14.4/8.14.4) with ESMTP id o54JH42x007293; Fri, 4 Jun 2010 12:17:04 -0700 Received: (from rth@localhost) by anchor.twiddle.home (8.14.4/8.14.4/Submit) id o54JH1ie007292; Fri, 4 Jun 2010 12:17:01 -0700 From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 4 Jun 2010 12:14:34 -0700 Message-Id: <1275678883-7082-27-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.0.1 In-Reply-To: <1275678883-7082-1-git-send-email-rth@twiddle.net> References: <1275678883-7082-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: agraf@suse.de, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH 26/35] tcg-s390: Tidy goto_tb. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Invent tcg_out_ld_abs, using LOAD RELATIVE instructions, and use it. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index f1e00e9..822835b 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -59,12 +59,14 @@ typedef enum S390Opcode { RIL_ALGFI = 0xc20a, RIL_BRASL = 0xc005, RIL_BRCL = 0xc004, - RIL_LARL = 0xc000, RIL_IIHF = 0xc008, RIL_IILF = 0xc009, + RIL_LARL = 0xc000, RIL_LGFI = 0xc001, + RIL_LGRL = 0xc408, RIL_LLIHF = 0xc00e, RIL_LLILF = 0xc00f, + RIL_LRL = 0xc40d, RIL_MSFI = 0xc201, RIL_MSGFI = 0xc200, RIL_NIHF = 0xc00a, @@ -755,6 +757,27 @@ static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg data, } } +/* load data from an absolute host address */ +static void tcg_out_ld_abs(TCGContext *s, TCGType type, TCGReg dest, void *abs) +{ + tcg_target_long addr = (tcg_target_long)abs; + + if (facilities & FACILITY_GEN_INST_EXT) { + tcg_target_long disp = (addr - (tcg_target_long)s->code_ptr) >> 1; + if (disp == (int32_t)disp) { + if (type == TCG_TYPE_I32) { + tcg_out_insn(s, RIL, LRL, dest, disp); + } else { + tcg_out_insn(s, RIL, LGRL, dest, disp); + } + return; + } + } + + tcg_out_movi(s, TCG_TYPE_PTR, dest, addr & ~0xffff); + tcg_out_ld(s, type, dest, dest, addr & 0xffff); +} + static void tgen_ext8s(TCGContext *s, TCGType type, TCGReg dest, TCGReg src) { if (facilities & FACILITY_EXT_IMM) { @@ -1360,18 +1383,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, if (s->tb_jmp_offset) { tcg_abort(); } else { - tcg_target_long off = ((tcg_target_long)(s->tb_next + args[0]) - - (tcg_target_long)s->code_ptr) >> 1; - if (off == (int32_t)off) { - /* load address relative to PC */ - tcg_out_insn(s, RIL, LARL, TCG_TMP0, off); - } else { - /* too far for larl */ - tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP0, - (tcg_target_long)(s->tb_next + args[0])); - } /* load address stored at s->tb_next + args[0] */ - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP0, TCG_TMP0, 0); + tcg_out_ld_abs(s, TCG_TYPE_PTR, TCG_TMP0, s->tb_next + args[0]); /* and go there */ tcg_out_insn(s, RR, BCR, S390_CC_ALWAYS, TCG_TMP0); }