From patchwork Thu Apr 19 13:33:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153812 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 3B368B7004 for ; Fri, 20 Apr 2012 01:16:21 +1000 (EST) Received: from localhost ([::1]:45000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrW2-0006or-Ax for incoming@patchwork.ozlabs.org; Thu, 19 Apr 2012 09:35:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUl-0004dj-GV for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:34:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKrUf-00009a-5D for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:59 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:50602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKrUe-00005a-Ur for qemu-devel@nongnu.org; Thu, 19 Apr 2012 09:33:53 -0400 Received: by mail-iy0-f173.google.com with SMTP id j26so13899481iaf.4 for ; Thu, 19 Apr 2012 06:33:52 -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=H8dlebZz/GDiWJLiMj/NTtwPAwbiyeG8aQhxGAqQL9M=; b=Y4qHoNcIyDR46t7DZJ+g6zsHvwM2TeWTE48XkA/TLBjH1cI+nJenxI0Je1WymfKczL B2ph++YB+gzl1ujW4b1sIn3Et2Y2YPI1XKMaeUHGSzBb4eghT2pNo2vaTdzySQYAPn2V x6yzN6MkxRSvNsiLJC+3durOh3n9s4S2sZuepB6Gf8dflWwjNeSxD5veyDit/HqasXUS 4SnoHZ/TK8jA9Z7L/w3uagk/pY4vkYnFb2Ufo9kESFfFQo7EzU1fuHlS1O4n/AaqGuIO 0HancoEIar+kK+AQ/WmUyCahi6dIDrU/PXceleuktOx5MepHYfRWODD/uxGq0mAOUZTA RIiA== Received: by 10.42.151.133 with SMTP id e5mr1742957icw.7.1334842432185; Thu, 19 Apr 2012 06:33:52 -0700 (PDT) Received: from pebble.com ([12.236.175.36]) by mx.google.com with ESMTPS id b11sm6529633igq.7.2012.04.19.06.33.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Apr 2012 06:33:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 19 Apr 2012 08:33:15 -0500 Message-Id: <1334842395-31819-15-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1334842395-31819-1-git-send-email-rth@twiddle.net> References: <1334842395-31819-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.173 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 14/14] tcg-sparc: Fix and enable direct TB chaining. 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 --- exec-all.h | 9 ++++++--- tcg/sparc/tcg-target.c | 19 ++++++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/exec-all.h b/exec-all.h index 6bcc075..ece4226 100644 --- a/exec-all.h +++ b/exec-all.h @@ -121,9 +121,10 @@ void tb_invalidate_phys_addr(target_phys_addr_t addr); #define CODE_GEN_AVG_BLOCK_SIZE 64 #endif -#if defined(_ARCH_PPC) || defined(__x86_64__) || defined(__arm__) || defined(__i386__) -#define USE_DIRECT_JUMP -#elif defined(CONFIG_TCG_INTERPRETER) +#if defined(__arm__) || defined(_ARCH_PPC) \ + || defined(__x86_64__) || defined(__i386__) \ + || defined(__sparc__) \ + || defined(CONFIG_TCG_INTERPRETER) #define USE_DIRECT_JUMP #endif @@ -233,6 +234,8 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) __asm __volatile__ ("swi 0x9f0002" : : "r" (_beg), "r" (_end), "r" (_flg)); #endif } +#elif defined(__sparc__) +extern void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr); #else #error tb_set_jmp_target1 is missing #endif diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index 72d65cb..ac214e6 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -1102,10 +1102,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, case INDEX_op_goto_tb: if (s->tb_jmp_offset) { /* direct jump method */ - tcg_out_sethi(s, TCG_REG_T1, args[0] & 0xffffe000); - tcg_out32(s, JMPL | INSN_RD(TCG_REG_G0) | INSN_RS1(TCG_REG_T1) | - INSN_IMM13((args[0] & 0x1fff))); s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf; + tcg_out32(s, CALL | (8 >> 2)); } else { /* indirect jump method */ tcg_out_ld_ptr(s, TCG_REG_T1, (tcg_target_long)(s->tb_next + args[0])); @@ -1624,3 +1622,18 @@ void tcg_register_jit(void *buf, size_t buf_size) tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame)); } + +void tb_set_jmp_target1(unsigned long jmp_addr, unsigned long addr) +{ + uint32_t *ptr = (uint32_t *)jmp_addr; + tcg_target_long disp = (tcg_target_long)(addr - jmp_addr) >> 2; + + /* We can reach the entire address space for 32-bit. For 64-bit + the code_gen_buffer can't be larger than 2GB. */ + if (TCG_TARGET_REG_BITS == 64 && !check_fit_tl(disp, 30)) { + tcg_abort(); + } + + *ptr = CALL | (disp & 0x3fffffff); + flush_icache_range(jmp_addr, jmp_addr + 4); +}