From patchwork Wed May 3 07:22:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 678756 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp914921wrs; Wed, 3 May 2023 00:43:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4T8NzVJaB1mKEm91ClrRkZx2flVMnDdosM4OWBWLuF6S2A2rCiN2BElneG7L0NBqJntGSj X-Received: by 2002:a05:622a:1a84:b0:3e6:3851:b945 with SMTP id s4-20020a05622a1a8400b003e63851b945mr31764821qtc.67.1683099817170; Wed, 03 May 2023 00:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683099817; cv=none; d=google.com; s=arc-20160816; b=c8NfRpfsKBHt8VQMl2A88wCnoxQowCAibY4oeJd6XfYef+ahzuZVvrihM4c2Qk0T5H 0PylCZuuE3uMqDsJ6xwC5zur8N0Fs14e9bdareZRYpaHUAp94d6mDBIfWGGnrkxAF8WS OyHvN5FEpLeLLzVquMv9wS4dxp1qLLK3gZ2XtfrLg11el6vBjgq4ZHZgGbvAaGHmxQDf 90SlfsgQuacp61SENSEC3L+3OGufg9rFuep+iQvKAcFKlZ3M01vwke2ROmHbxOjIXKrv x25hT0xeNFV4yEW78+TSSU/1tPzZyQbKfJB4ic2kxrwJ3CKZ46gL5jRSjgj2PQy/A1hZ ChFA== 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:cc:to :from:dkim-signature; bh=ltltnSmlPnCka61roKfkDJCxGmwdYrh10AhkBoJXCRA=; b=QAR636s131WfNdR6Oh8ThnZAx7IpCqcZ6IN3Xaicjj9kKc9yNsNoR8tw7ADtx6Zv4W mNe6F7VLF9PwGxe9AfhK4JVcLStxI/inGt2ECx4rypbN1YOEaFpsTzgPVX7XjZsyhcYW DVyvhvB6uWt07tewlSDOiqezd44jbFZ7WeLfmjCldHQRmBbITGFfrVofxml0CGaimU/y nziZ9PMaItstEC27V/S/Xmha+QkeeypIVORzi3lHSVif9ddDWfWk727k9oi8HZfs7dnD YIUqkdzLQo305jTqjYhGdmXWUQMJuNLUkCugqJxFKC5dwe4Qyy8sN20hunmKF6CyzTru Orpw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AQmyeMVA; 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 z16-20020a05622a061000b003d416b846fdsi18605947qta.498.2023.05.03.00.43.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 May 2023 00:43: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=AQmyeMVA; 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 1pu6rW-0005sf-7c; Wed, 03 May 2023 03:25: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 1pu6qK-0002ZI-7u for qemu-devel@nongnu.org; Wed, 03 May 2023 03:24:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pu6qH-0001mV-Po for qemu-devel@nongnu.org; Wed, 03 May 2023 03:24:03 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f1950f5676so49117095e9.3 for ; Wed, 03 May 2023 00:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1683098640; x=1685690640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ltltnSmlPnCka61roKfkDJCxGmwdYrh10AhkBoJXCRA=; b=AQmyeMVASsPxLF0x3c/9B168MqSQ6dXEKQr6MfusQjLVFEjZAi9dt3j93p8ayBuj0F X/d3CQkGDaXhKBu5FDM8sBLlXz5pDbC1BudasPOMqKanXPEugZj1eVzhkwkfc1tlHfXc xY9yh5zVzJSPlE3nzDLIhSHdyDHHp2bSSa5LEjeq+wehqlYE9RbeqTQo99uuZSEycm+e rMbLbZNja4c1qQi9MABasT8cld8jWFZEkiupgSgZ7M1EpJusX+sX65XmuG/QwD3g+cuN 6MgR5eIT4QGZLTNO84glmg94XJKH9Ea6u2bqXzm4UnBEKiu9XBYtBeWOpppdF1PYZCMp H5fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683098640; x=1685690640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ltltnSmlPnCka61roKfkDJCxGmwdYrh10AhkBoJXCRA=; b=WATM+0dVqZE1CTgJKnKQ3wQu5rW6Vo1de9dhVHacfJfRVvu4nb63I6srBfg+4yEOlv lf4DA+giqv9UOsNu4U1KcU9PI0ii4N3NGPckQMSlY6vaHIgBB0r2scjrvXXxtakI3qBY 0yCksD7MqfQq6hR0yz+bwHwN0KoCUoad0vFpBezTrWlIYl86rqGs/15JGke2vUeatRAA TSJn+V0rm3DBIbNkYj/ww6nBdYwW/5tBpWx/ZzYAwQyxXvueiZ5HvWiFng7ZhFaPtuMX 8w1EMm1jucjkrvAzEn++vMyyIIzpT+6J40xNuHixqloCKQ8UB0y0hDc4sHzEaNwXydvj hyjg== X-Gm-Message-State: AC+VfDyMRc8XFl2aiHRn3rnyAr1yzBpODm+MXYBbbotm5KT4MXniogdh Fini+9JJ71TJdTjjy5tfj1nuoWiGBy+i9tLk0n41CQ== X-Received: by 2002:a7b:cc1a:0:b0:3f1:969f:c9d0 with SMTP id f26-20020a7bcc1a000000b003f1969fc9d0mr13715241wmh.4.1683098640437; Wed, 03 May 2023 00:24:00 -0700 (PDT) Received: from stoup.Home ([2a02:c7c:74db:8d00:c01d:9d74:b630:9087]) by smtp.gmail.com with ESMTPSA id b14-20020a05600010ce00b0030627f58325sm9586745wrx.25.2023.05.03.00.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 00:24:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: ale@rev.ng, philmd@linaro.org, marcel.apfelbaum@gmail.com, wangyanan55@huawei.com, anjo@rev.ng Subject: [PATCH 36/84] tcg: Split out tcg/debug-assert.h Date: Wed, 3 May 2023 08:22:43 +0100 Message-Id: <20230503072331.1747057-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503072331.1747057-1-richard.henderson@linaro.org> References: <20230503072331.1747057-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32f.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, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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 Signed-off-by: Richard Henderson --- include/tcg/debug-assert.h | 17 +++++++++++++++++ include/tcg/tcg.h | 9 +-------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 include/tcg/debug-assert.h diff --git a/include/tcg/debug-assert.h b/include/tcg/debug-assert.h new file mode 100644 index 0000000000..596765a3d2 --- /dev/null +++ b/include/tcg/debug-assert.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Define tcg_debug_assert + * Copyright (c) 2008 Fabrice Bellard + */ + +#ifndef TCG_DEBUG_ASSERT_H +#define TCG_DEBUG_ASSERT_H + +#if defined CONFIG_DEBUG_TCG || defined QEMU_STATIC_ANALYSIS +# define tcg_debug_assert(X) do { assert(X); } while (0) +#else +# define tcg_debug_assert(X) \ + do { if (!(X)) { __builtin_unreachable(); } } while (0) +#endif + +#endif diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 60d4923de3..57ea0b7d1d 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -34,6 +34,7 @@ #include "tcg/tcg-mo.h" #include "tcg-target.h" #include "tcg/tcg-cond.h" +#include "tcg/debug-assert.h" /* XXX: make safe guess about sizes */ #define MAX_OP_PER_INSTR 266 @@ -222,14 +223,6 @@ typedef uint64_t tcg_insn_unit; /* The port better have done this. */ #endif - -#if defined CONFIG_DEBUG_TCG || defined QEMU_STATIC_ANALYSIS -# define tcg_debug_assert(X) do { assert(X); } while (0) -#else -# define tcg_debug_assert(X) \ - do { if (!(X)) { __builtin_unreachable(); } } while (0) -#endif - typedef struct TCGRelocation TCGRelocation; struct TCGRelocation { QSIMPLEQ_ENTRY(TCGRelocation) next;