From patchwork Sat Sep 22 02:05: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: 186068 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 0965C2C0088 for ; Sat, 22 Sep 2012 13:03:26 +1000 (EST) Received: from localhost ([::1]:43520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFF6z-0007LU-2z for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 22:06:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57593) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFF5z-0005Wf-N2 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 22:05:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFF5y-0000sw-HM for qemu-devel@nongnu.org; Fri, 21 Sep 2012 22:05:27 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:64832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFF5y-0000kG-BR for qemu-devel@nongnu.org; Fri, 21 Sep 2012 22:05:26 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so615289pad.4 for ; Fri, 21 Sep 2012 19:05:26 -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=aQou7maE5NE00roBF5oaCbAWU7uEv+inmjQu2UTPjw0=; b=ODovj9jIhkjKd2mM55dBl2a1tl3IlY9INA3Wpv3S+uNuowWCtfd8REQi/UoklENM0+ EuttxRfpYlkb2sd+eLt6dNMPcRQRuD+Xt4kneBCgOTLtwn/bNmKs80V05C1+4vcouIIS ImOh3XhwA+guc1G+tIWA0GO1lRlfxlEv1JZv1TVKW19S+sdPbvs0XgI+y9wiUoVed5Ib szisWkIUNJR6Ck5NAjPH7YTYgWdV/6Kg6pxSGNG4bLM8tXWyLUKmhgaUPY2NMtv1B6vy rieBvqLTmLKQiHFhAJJU505Z4fpIrNvTmzi+PVouMPcLUSfgEOxn0hYlBg46+9f4Oqza xz8A== Received: by 10.68.135.137 with SMTP id ps9mr8761636pbb.136.1348279526021; Fri, 21 Sep 2012 19:05:26 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id s4sm4956298paw.35.2012.09.21.19.05.25 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 19:05:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 21 Sep 2012 19:05:06 -0700 Message-Id: <1348279507-3617-14-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348279507-3617-1-git-send-email-rth@twiddle.net> References: <1348279507-3617-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.220.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 13/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 | 21 ++++++++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/exec-all.h b/exec-all.h index dba9609..6516da0 100644 --- a/exec-all.h +++ b/exec-all.h @@ -132,9 +132,10 @@ static inline void tlb_flush(CPUArchState *env, int flush_global) #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 @@ -244,6 +245,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__) +void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t 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 03c385a..1db0c9d 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -1072,10 +1072,10 @@ 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))); + uint32_t old_insn = *(uint32_t *)s->code_ptr; s->tb_jmp_offset[args[0]] = s->code_ptr - s->code_buf; + /* Make sure to preserve links during retranslation. */ + tcg_out32(s, CALL | (old_insn & ~INSN_OP(-1))); } else { /* indirect jump method */ tcg_out_ld_ptr(s, TCG_REG_T1, @@ -1595,3 +1595,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(uintptr_t jmp_addr, uintptr_t 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); +}