From patchwork Wed May 31 04:03:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 687256 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1062637wru; Tue, 30 May 2023 21:09:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7quy5fZCyt6CCovmp9ME8aKdw7nRH2pT6WGL2W5PyW5uv2HxbdHZUMZ640OXC6P2eo30YX X-Received: by 2002:a05:6214:27e2:b0:621:700b:f9ef with SMTP id jt2-20020a05621427e200b00621700bf9efmr4954277qvb.15.1685506177344; Tue, 30 May 2023 21:09:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685506177; cv=none; d=google.com; s=arc-20160816; b=QetozRmx6FuFEYhPRBjaougdapcmRxUdO/wl4OAlbS3Gb+WDqrwLqqmjifLo6PEe5S HK1Z7029oMS1wnbRh+Oz8xdp1bBfw4d2zj6rtDsWUybqbcBDtL3ZGue3FXB4AEIj3N7H rQIxJK+q0t/FdBaWEBK1XbT7TzB8c37oUsA6Tn5XQxudDXZlfV14GbOoFajCf6sP7ukU TYkCE3vhWVpEFr8viiGuOwHvjzb70ptFk27fbzLXozlHcdNo+CvfyKgM9BDPF77xozfK 68JlmjGu+db6YCGq5+GlBdmva3jthdHyboxxJmF7F1wH/J4lloineP2rp7RTbNTnYcwI DChg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Br8zXaVAOKNlB9xv5g9cPNHLqbtW8oBpWMoxXID7zwE=; b=ZWBsXx6DKWle4XQwZzr5vu6/n/6ZTS/I39F7JK7h6mlq4AkZYPspkZ5aMvmDtDXiNY 5NW3NakKhgB6fTorpIDGCVFgdO0K7G8PROuph7jBm+sDmwj7LPVry4UA4UBPnsC/lGE0 gwlg6eoQXXB8k9kt7P+AS15RKqDFpgnJXRK/tkHYicXFW87kYnprH0Q/aidEah0IWzWq oT/Dv5AyH/pG0/WoHlZq49O7/T8rGd0Q/+HspXDFXV7YPnjcvjvP+OZhSbLLxQPRYlbl /xse7uIfQ0XKiI4CBivwV05/G+hpfUAh0yfgzOFoFn1pb39zUKXK4v1Om+7C0N43QQHr 3j0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JkjY80sN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t11-20020a0562140c6b00b005ac81946c7esi7621578qvj.398.2023.05.30.21.09.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 May 2023 21:09:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JkjY80sN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q4D7G-0003U3-Fv; Wed, 31 May 2023 00:07:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q4D7B-0003DB-Cl for qemu-devel@nongnu.org; Wed, 31 May 2023 00:07:14 -0400 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q4D76-0006vI-06 for qemu-devel@nongnu.org; Wed, 31 May 2023 00:07:13 -0400 Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-33b1e83e1daso5402115ab.0 for ; Tue, 30 May 2023 21:07:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685506025; x=1688098025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Br8zXaVAOKNlB9xv5g9cPNHLqbtW8oBpWMoxXID7zwE=; b=JkjY80sN/xIzZs3jW1dXf1x9YB1B3+ml++vbzcmpCNqkuHMUGHYQMGMtp9W25QyB8X mMrST86zk1QZE7U/yupamBEiaqQR2At1sOPewGnHTK5FmpSTIl+pbqrHEeETLzV+5EEs s+QEkGzJ56StWc98IYNxnhTVMLqvarj1pWOKQhaQKNM2qFPHKt8GsUT6KvOkpWiqSsl5 THYwzpalefNJ0IwN+VmJEND4+2T0aWDp2QQeik/B9MMxP6wM2FrGoSr+s93DsT0pvQEu 0im4ydKkif0gg2HJ8LSc45jXCMzfc4LaSiOwP6kO62WznOViRNpJOzCQ5tSIfvjxEAEh /WNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685506025; x=1688098025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Br8zXaVAOKNlB9xv5g9cPNHLqbtW8oBpWMoxXID7zwE=; b=ftqR+vG6RMOdpP4zQ1TD8T1kx6mYJsOrTujrQXV/OMZwgtAINAvR1Oqc1YXhcnVue3 5+sTX2C3O3E6mpolO0gApSBRWdMIhMjqMomffRP18H9W6IxOoXNxS/Xx+Vgmyuva06iw BrJqDuelo4DQ1iMogdz5FV7Ncc4MxvemNO+LOydiw7UJye6gjS7GgtrR6eNet1wlYk8i 2iILBsb4Q7wfsX+YLfFd8K0VDoRoLixvWzamsj1ni7n7iSBiEAWCTlfUfHojCXBZrqHz M788glgblPMyX0+eHmL7VKi+XjYYq3Wl9rZYMPiVupBlt8rEXh43eAVEwbJxyJ/Wz6lK z6uA== X-Gm-Message-State: AC+VfDy3rubPy70IiJz9zp2doaffj1xNjpYk3bHn5r80s3itXDtuwuoF bsgBtyjVq5Gwjsgg5gHrGLETPhJ9KVMHv6wCbFs= X-Received: by 2002:a05:6e02:5cf:b0:335:9028:d6d1 with SMTP id l15-20020a056e0205cf00b003359028d6d1mr999753ils.32.1685506025671; Tue, 30 May 2023 21:07:05 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:1cd:ec7a:a720:ce9a]) by smtp.gmail.com with ESMTPSA id h13-20020a170902f7cd00b001aadd0d7364sm151797plw.83.2023.05.30.21.07.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 May 2023 21:07:05 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 43/48] tcg: Move env defines out of NEED_CPU_H in helper-head.h Date: Tue, 30 May 2023 21:03:25 -0700 Message-Id: <20230531040330.8950-44-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230531040330.8950-1-richard.henderson@linaro.org> References: <20230531040330.8950-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::12b; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x12b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since the change to CPUArchState, we have a common typedef that can always be used. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- include/exec/helper-head.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/exec/helper-head.h b/include/exec/helper-head.h index a355ef8ebe..28ceab0a46 100644 --- a/include/exec/helper-head.h +++ b/include/exec/helper-head.h @@ -22,6 +22,7 @@ #define dh_alias_f64 i64 #define dh_alias_ptr ptr #define dh_alias_cptr ptr +#define dh_alias_env ptr #define dh_alias_void void #define dh_alias_noreturn noreturn #define dh_alias(t) glue(dh_alias_, t) @@ -37,6 +38,7 @@ #define dh_ctype_f64 float64 #define dh_ctype_ptr void * #define dh_ctype_cptr const void * +#define dh_ctype_env CPUArchState * #define dh_ctype_void void #define dh_ctype_noreturn G_NORETURN void #define dh_ctype(t) dh_ctype_##t @@ -52,9 +54,6 @@ # endif # endif # define dh_ctype_tl target_ulong -# define dh_alias_env ptr -# define dh_ctype_env CPUArchState * -# define dh_typecode_env dh_typecode_ptr #endif /* We can't use glue() here because it falls foul of C preprocessor @@ -96,6 +95,7 @@ #define dh_typecode_f32 dh_typecode_i32 #define dh_typecode_f64 dh_typecode_i64 #define dh_typecode_cptr dh_typecode_ptr +#define dh_typecode_env dh_typecode_ptr #define dh_typecode(t) dh_typecode_##t #define dh_callflag_i32 0