From patchwork Mon May 6 12:37:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794993 Delivered-To: patch@linaro.org Received: by 2002:adf:a453:0:b0:34e:ceec:bfcd with SMTP id e19csp901084wra; Mon, 6 May 2024 05:38:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXQDWPfw77pSvdeQ0RN8RBMdcP7wUUyfdXFnJi/QxnzUAM2HT5T8+aoeARXJGjIfk2au8LHToa/M/K2kBr5tLUu X-Google-Smtp-Source: AGHT+IEC1zJpBYl57zHexa6LgsjBG0aGh+KMeRtd5dDo3en7U82otuXuCG2e1FPqJQZQA2Q0NVno X-Received: by 2002:ad4:5aea:0:b0:6a0:d4dd:cb44 with SMTP id c10-20020ad45aea000000b006a0d4ddcb44mr11762771qvh.62.1714999115215; Mon, 06 May 2024 05:38:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714999115; cv=none; d=google.com; s=arc-20160816; b=PrWlqrevWNSBG8fEKbuvQgRgV/UUz0A6E+v3KGYkaALRUgrlFASTWJAD198UsmaJ66 TRtE4og9oSoGkohBmFJR3Luc0Q/bjbrI475fMOkWRbXgHW4uKPVkzHYfC6/+vWXKgIIw iUQdvJL+i1E0t6Qdir1xUBoWBG3ecUfEH7gIni+JzvleKFPyFzb1rAgpyOlBraCMUzBc ozIPHqgk/6VhkTp0e9T9EDNtlfWdnGXXJfr2tG3fTvql1rN5yPjCc6tQXe2ErXGAESOX ojPirI6vsYeCcWMQQ7WR9PO4KaOFUpYATMZEfWJ9MfkuZXzkYligsL4Hw+AAjS87UKds zMPQ== 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=ms63JUeYQatGE3m9Aklqy6cJtKRUtl0Fpr26HXH+Ppg=; fh=qtn8prgQtzf5IzCNvLChUZDElvNECP6ej9YfjQeBz3I=; b=HBcUTZZpHZkbUw7ZWzjaqiOSqecVh1dDDj9Npr5Anwu5zcMu8xVdG//2Pf7yc0mjAu cfoktBmr2sLKBldypkLQ69Yi96fikGf6PZ3mQolRbV7YmvHElaOk3Rh8WW+YrkfcMmYu +GHcQJjH1VtrJPrzWHMnZJsmWzLYR9HhiU2yaSKFrA9uJeIQoZa7w6is+BG8hc755A6H Sd6xXqZNCRbXuDnI6G1lp0rwudWIc5mkMKek5xuZTryxBmwB2WaEgoqqGQOdgnQxV4EO qEQoFe3NANSj+Lc3stWvf8GOejbyQcUyhC8h64REASFHrDgN2wBHravwAfmNznxNvHey o+IQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yJl95uhK; 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 gw1-20020a0562140f0100b00698ebf6b7ecsi9417521qvb.203.2024.05.06.05.38.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 May 2024 05:38:35 -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=yJl95uhK; 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 1s3xbJ-00015V-Hw; Mon, 06 May 2024 08:37:50 -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 1s3xbB-00014Q-CF for qemu-devel@nongnu.org; Mon, 06 May 2024 08:37:41 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s3xb9-0001vQ-Ij for qemu-devel@nongnu.org; Mon, 06 May 2024 08:37:41 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-34dc9065606so1000711f8f.1 for ; Mon, 06 May 2024 05:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714999058; x=1715603858; darn=nongnu.org; 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=ms63JUeYQatGE3m9Aklqy6cJtKRUtl0Fpr26HXH+Ppg=; b=yJl95uhKu3XnnmZ+O2az6cjAje8ewLyCDTo18UXuYzhLyhQZw1OrINE4guC/qJz11n 1lO7dsySJqwldGoPSwFf1a/SLIzra5+7OdyKH/4/6Og8gcBNE90aSMMu3eDoZVmqNYN5 NXXfYqdxLhTfz51KIXHophVUSD+1ZgTm0Pei/ZcmNEkimdZl6FyUUwjp52sPzsd8MG4e jo3e8XZVt8hYQ3DYL3voZTL94QNW47H7LhuMzEfkBiQt5MFkdPxMvkvf8KeVEp4w9BT2 RwEipIS14rT2knUeCR3wsgBUpHSfeb6kG3eE6dZ2scOnVVRWiGd2HFz32j6ojSihx55X KNYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714999058; x=1715603858; 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=ms63JUeYQatGE3m9Aklqy6cJtKRUtl0Fpr26HXH+Ppg=; b=pjMsF/9+oCePwbgG9bOXm6XP1IAUzSDmJ1Pm48gryX/a5V73hdd3p34F3ESeMwYvCj 8Rltdq5KIe6GFq1rPxOBATp8XOqlbz0MCq/PM4+itO2YnLJCaNUs6oTwPRn+csGC/vko wFI6am4ByYNaPv53KEMXecsFDwUEEaIdcYpauI0Ns0npFC4t7TIcCR62XGM8Weis/VXY JFqH4UUgOmDo8rowq5l6UCUEpnfrYGfyHQPsV++PSA6m+HqzzLjM/8cals31D55LB2Fc CDpK02favKs4wBKBCZ+6YhK1RNgj04QZWARhzr3kRqTLo4hnCl4nvCAViwdhMC21ofgF UG7g== X-Gm-Message-State: AOJu0YxcAcTswyFH7W+WswlkWYE8t6x9+4ijtgwNmUFWUYJUKEtkCZrU 3UNC8+tlMwHMQpLC+NJxqjNWlhJs+iHpAvCeH3t2aNg9mJOBC6rGVGRHOLohPqWN3KD3UsFzmgT o X-Received: by 2002:a5d:4c91:0:b0:34d:a37d:d383 with SMTP id z17-20020a5d4c91000000b0034da37dd383mr11873247wrs.22.1714999057721; Mon, 06 May 2024 05:37:37 -0700 (PDT) Received: from m1x-phil.lan ([176.187.211.4]) by smtp.gmail.com with ESMTPSA id t3-20020a05600001c300b0034df7313bf1sm10715987wrx.0.2024.05.06.05.37.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 06 May 2024 05:37:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 01/28] exec/cpu: Indent TARGET_PAGE_foo definitions Date: Mon, 6 May 2024 14:37:01 +0200 Message-ID: <20240506123728.65278-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240506123728.65278-1-philmd@linaro.org> References: <20240506123728.65278-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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 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 The TARGET_PAGE_foo definitions are defined with multiple level of #ifdef'ry. Indent it a bit for clarity. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20240427155714.53669-6-philmd@linaro.org> --- include/exec/cpu-all.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 032c6d990e..14fd40046d 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -139,19 +139,20 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val #ifdef TARGET_PAGE_BITS_VARY # include "exec/page-vary.h" extern const TargetPageBits target_page; -#ifdef CONFIG_DEBUG_TCG -#define TARGET_PAGE_BITS ({ assert(target_page.decided); target_page.bits; }) -#define TARGET_PAGE_MASK ({ assert(target_page.decided); \ - (target_long)target_page.mask; }) +# ifdef CONFIG_DEBUG_TCG +# define TARGET_PAGE_BITS ({ assert(target_page.decided); \ + target_page.bits; }) +# define TARGET_PAGE_MASK ({ assert(target_page.decided); \ + (target_long)target_page.mask; }) +# else +# define TARGET_PAGE_BITS target_page.bits +# define TARGET_PAGE_MASK ((target_long)target_page.mask) +# endif +# define TARGET_PAGE_SIZE (-(int)TARGET_PAGE_MASK) #else -#define TARGET_PAGE_BITS target_page.bits -#define TARGET_PAGE_MASK ((target_long)target_page.mask) -#endif -#define TARGET_PAGE_SIZE (-(int)TARGET_PAGE_MASK) -#else -#define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS -#define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS) -#define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS) +# define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS +# define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS) +# define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS) #endif #define TARGET_PAGE_ALIGN(addr) ROUND_UP((addr), TARGET_PAGE_SIZE)