From patchwork Thu Oct 26 15:27:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10028563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 96F736032C for ; Thu, 26 Oct 2017 15:28:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 869A628E73 for ; Thu, 26 Oct 2017 15:28:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7B8D628E80; Thu, 26 Oct 2017 15:28:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 139BF28E73 for ; Thu, 26 Oct 2017 15:28:29 +0000 (UTC) Received: from localhost ([::1]:53486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7k57-0006kd-1r for patchwork-qemu-devel@patchwork.kernel.org; Thu, 26 Oct 2017 11:28:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7k3w-0006iJ-QI for qemu-devel@nongnu.org; Thu, 26 Oct 2017 11:27:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7k3s-0005f8-0t for qemu-devel@nongnu.org; Thu, 26 Oct 2017 11:27:15 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:54238) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7k3r-0005e6-Q2 for qemu-devel@nongnu.org; Thu, 26 Oct 2017 11:27:11 -0400 Received: by mail-wm0-x243.google.com with SMTP id r196so9130506wmf.2 for ; Thu, 26 Oct 2017 08:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dAUXn4tO6Y/YnlZNqYl9N5BED7eh2hifNvxB112ONJo=; b=OwfMpIKn4kCO5EAy47E/KYXi8go2wd2dbebkSxMDiO8b8i/79WiS76w/FTncZwPMa/ zAKifHiijcH5uCkMPFreuGRkNz83QLz21SB41VJHeQ/1J4jVe20u82/MaR2TuPDrcH0t w5M6S+e53xbNIiJVoCjyN6LCwaEKdbl1g6dsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dAUXn4tO6Y/YnlZNqYl9N5BED7eh2hifNvxB112ONJo=; b=qoHxx3RJ7NFsnb/KgRO6aqVpko1/vVflqzWZFQw1uN9J0snkf7hZIMvKjLYF1BV9Yw CUA9d5IcGYGueAMAeh+5J4e2289A/pZFrBcf5D/sI9XOCXL3LiKjOq01sF0Q3RwdAwmk Eh7mQ3PnUJJZgP6ghu6KUQJg6FW2Ac6HWMXkykYFtY93xOITS9E4G+Pp6ER67z9kpNKR 9p98eL22k4VzNEiQ5HOUMEM23Vymq7P2pTVHviEbj6L7CoGxfFY1m8p3yAP/QjlIup+S ItSuCn6d4M6I3laejRzJUdjo6ZwUhXe4mUChO3VWgVO4P3/8Ym3nUxPG2WhuAJisswkO ZsYg== X-Gm-Message-State: AMCzsaXD5a2hEEytjh+mY9jLUbpcakcv/blY05F6ZiFEDFDjagYvIEhE CEt1Ey4W0fPFHtqDNBpyCYy3VPrdfTc= X-Google-Smtp-Source: ABhQp+TvWLy947PTog/Lz1uL7itFj+KBvbru0oQDgOPPiZ2t+e1Wh1m/RyfBalTAB65IMHB6l4/D2g== X-Received: by 10.28.199.4 with SMTP id x4mr1701547wmf.124.1509031630594; Thu, 26 Oct 2017 08:27:10 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.108]) by smtp.gmail.com with ESMTPSA id k13sm9921825wrd.95.2017.10.26.08.27.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Oct 2017 08:27:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 26 Oct 2017 17:27:03 +0200 Message-Id: <20171026152704.24525-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171026152704.24525-1-richard.henderson@linaro.org> References: <20171026152704.24525-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 1/2] tcg: Allow constant pool entries in the prologue X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent.desnogues@gmail.com, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Both ARMv6 and AArch64 currently may drop complex guest_base values into the constant pool. But generic code wasn't expecting that, and the pool is not emitted. Correct that. Reported-by: Laurent Desnogues Signed-off-by: Richard Henderson Tested-by: Emilio G. Cota Tested-by: Laurent Desnogues --- tcg/tcg.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 683ff4abb7..c22f1c4441 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -771,12 +771,32 @@ void tcg_prologue_init(TCGContext *s) /* Put the prologue at the beginning of code_gen_buffer. */ buf0 = s->code_gen_buffer; + total_size = s->code_gen_buffer_size; s->code_ptr = buf0; s->code_buf = buf0; + s->data_gen_ptr = NULL; s->code_gen_prologue = buf0; + /* Compute a high-water mark, at which we voluntarily flush the buffer + and start over. The size here is arbitrary, significantly larger + than we expect the code generation for any one opcode to require. */ + s->code_gen_highwater = s->code_gen_buffer + (total_size - TCG_HIGHWATER); + +#ifdef TCG_TARGET_NEED_POOL_LABELS + s->pool_labels = NULL; +#endif + /* Generate the prologue. */ tcg_target_qemu_prologue(s); + +#ifdef TCG_TARGET_NEED_POOL_LABELS + /* Allow the prologue to put e.g. guest_base into a pool entry. */ + { + bool ok = tcg_out_pool_finalize(s); + tcg_debug_assert(ok); + } +#endif + buf1 = s->code_ptr; flush_icache_range((uintptr_t)buf0, (uintptr_t)buf1); @@ -785,21 +805,36 @@ void tcg_prologue_init(TCGContext *s) s->code_gen_ptr = buf1; s->code_gen_buffer = buf1; s->code_buf = buf1; - total_size = s->code_gen_buffer_size - prologue_size; + total_size -= prologue_size; s->code_gen_buffer_size = total_size; - /* Compute a high-water mark, at which we voluntarily flush the buffer - and start over. The size here is arbitrary, significantly larger - than we expect the code generation for any one opcode to require. */ - s->code_gen_highwater = s->code_gen_buffer + (total_size - TCG_HIGHWATER); - tcg_register_jit(s->code_gen_buffer, total_size); #ifdef DEBUG_DISAS if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) { qemu_log_lock(); qemu_log("PROLOGUE: [size=%zu]\n", prologue_size); - log_disas(buf0, prologue_size); + if (s->data_gen_ptr) { + size_t code_size = s->data_gen_ptr - buf0; + size_t data_size = prologue_size - code_size; + size_t i; + + log_disas(buf0, code_size); + + for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) { + if (sizeof(tcg_target_ulong) == 8) { + qemu_log("0x%08" PRIxPTR ": .quad 0x%016" PRIx64 "\n", + (uintptr_t)s->data_gen_ptr + i, + *(uint64_t *)(s->data_gen_ptr + i)); + } else { + qemu_log("0x%08" PRIxPTR ": .long 0x%08x\n", + (uintptr_t)s->data_gen_ptr + i, + *(uint32_t *)(s->data_gen_ptr + i)); + } + } + } else { + log_disas(buf0, prologue_size); + } qemu_log("\n"); qemu_log_flush(); qemu_log_unlock();