From patchwork Wed Jun 21 02:48:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 778594 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wsq7668vsz9s1h for ; Wed, 21 Jun 2017 12:54:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OgD6Xj6U"; dkim-atps=neutral Received: from localhost ([::1]:51550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNVmg-0002Ph-FQ for incoming@patchwork.ozlabs.org; Tue, 20 Jun 2017 22:54:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNVhS-0006e5-Vo for qemu-devel@nongnu.org; Tue, 20 Jun 2017 22:49:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNVhS-0002Sp-5k for qemu-devel@nongnu.org; Tue, 20 Jun 2017 22:48:59 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36460) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dNVhS-0002Sk-1Q for qemu-devel@nongnu.org; Tue, 20 Jun 2017 22:48:58 -0400 Received: by mail-qk0-x244.google.com with SMTP id r62so13614710qkf.3 for ; Tue, 20 Jun 2017 19:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=kzcO9PX8ZKIkRWFTGTSRtLfppn1jE2K0gSt00uyVLnk=; b=OgD6Xj6URk3FCjyBSRAhxMppQ4vq8PIRbI+3S5XyGjlkDJGs8GWP+tYS2P8rUb6GmD h0kV6EhDkFxy1yUYLAr3rt55OVk8wB4KB+WE2xDXqwFsuj+dkcoL0FdUaZlimN6119kg DxiQcMKXyP7o3uSuGPTTTi4JpnVmPWxw7tSzpVaLmV6yxoo4wQ8ng5H+KV03sf0YaK63 Sl4bg56u99A/cXg5qdFGsPbJ3KsknD2O7v9SpWMFrtRGUmK4Up2o/krtkwQxEO+MSvZV X2bE7m0yeUZE14u2V0vDVIS5rtX2IHTnZUSpOC+ojd6lC/7Vjemvye/4vZXya9JbGUvF xlAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=kzcO9PX8ZKIkRWFTGTSRtLfppn1jE2K0gSt00uyVLnk=; b=OG28+jCtFKCqLOD7N7bx8YBN5iZSylbYqO+hO9K2qR+8lTgUngmjEuZDiCyzas4xwa 0LaRC58X7RNwoqkSHF0nWKmZUXwPuitbjIntQ79v4vkoyYB4HxcNOSPR8NJlGSVaNC+v 5VJUdzH0Clf4h5miUAE+eELt8nVTfrTN9RTedHHg13VH2af25cAV3vE447dxoc/Urwlg gnajj6MC9+e7npP0Jhz3nlKW3DYnClXwS7X6zWzy08ggDpfehasFdTbpU9HZGbv5y00S Bp6JWSZho5wjfpAH4KofSaR5zaPv1APvD421uiUgZL3X6tTAP27ciy8LcQO4vYqIRfTx hjCA== X-Gm-Message-State: AKS2vOw8/JtMJILd6VcgR0WMYuhPsAvO9Hh1E7zadRaBYP+FPLcjXYhN bmjBXDcPBXGPv4ah2y4= X-Received: by 10.55.161.148 with SMTP id k142mr35380598qke.168.1498013337276; Tue, 20 Jun 2017 19:48:57 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id l53sm2478939qta.56.2017.06.20.19.48.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 19:48:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 20 Jun 2017 19:48:31 -0700 Message-Id: <20170621024831.26019-17-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170621024831.26019-1-rth@twiddle.net> References: <20170621024831.26019-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH 16/16] tcg: Store pointers to temporaries directly in TCGArg 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: aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- tcg/tcg.c | 8 ++++---- tcg/tcg.h | 14 ++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 1ca1192..c25f455 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -810,11 +810,11 @@ void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret, #else if (TCG_TARGET_REG_BITS < 64 && (sizemask & 1)) { #ifdef HOST_WORDS_BIGENDIAN - op->args[pi++] = ret + 1; + op->args[pi++] = ret + sizeof(TCGTemp); op->args[pi++] = ret; #else op->args[pi++] = ret; - op->args[pi++] = ret + 1; + op->args[pi++] = ret + sizeof(TCGTemp); #endif nb_rets = 2; } else { @@ -849,11 +849,11 @@ void tcg_gen_callN(TCGContext *s, void *func, TCGArg ret, have to get more complicated to differentiate between stack arguments and register arguments. */ #if defined(HOST_WORDS_BIGENDIAN) != defined(TCG_TARGET_STACK_GROWSUP) - op->args[pi++] = args[i] + 1; + op->args[pi++] = args[i] + sizeof(TCGTemp); op->args[pi++] = args[i]; #else op->args[pi++] = args[i]; - op->args[pi++] = args[i] + 1; + op->args[pi++] = args[i] + sizeof(TCGTemp); #endif real_args += 2; continue; diff --git a/tcg/tcg.h b/tcg/tcg.h index a5a0412..df73b31 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -520,7 +520,7 @@ typedef TCGv_ptr TCGv_env; #define TCG_CALL_NO_WG_SE (TCG_CALL_NO_WG | TCG_CALL_NO_SE) /* used to align parameters */ -#define TCG_CALL_DUMMY_ARG ((TCGArg)(-1)) +#define TCG_CALL_DUMMY_ARG 0 /* Conditions. Note that these are laid out for easy manipulation by the functions below: @@ -714,24 +714,26 @@ extern bool parallel_cpus; static inline size_t temp_idx(TCGTemp *ts) { - ptrdiff_t n = ts - tcg_ctx.temps; - tcg_debug_assert(n >= 0 && n < tcg_ctx.nb_temps); + size_t n = ts - tcg_ctx.temps; + tcg_debug_assert(n < tcg_ctx.nb_temps); return n; } static inline TCGArg temp_arg(TCGTemp *ts) { - return temp_idx(ts); + size_t n = ts - tcg_ctx.temps; + tcg_debug_assert(n < tcg_ctx.nb_temps); + return (uintptr_t)ts; } static inline TCGTemp *arg_temp(TCGArg a) { - return a == TCG_CALL_DUMMY_ARG ? NULL : &tcg_ctx.temps[a]; + return (TCGTemp *)(uintptr_t)a; } static inline size_t arg_index(TCGArg a) { - return a; + return temp_idx(arg_temp(a)); } static inline TCGv_i32 QEMU_ARTIFICIAL MAKE_TCGV_I32(TCGArg i)