From patchwork Tue Nov 7 12:24:29 2023 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: 741873 Delivered-To: patch@linaro.org Received: by 2002:adf:fd90:0:b0:32d:baff:b0ca with SMTP id d16csp1588155wrr; Tue, 7 Nov 2023 04:28:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHU1vLIADq8Fsev+N5DDqRh/Hs45QU9FetprBFVqjAIRxRC57xZKFFTihKO9O4LnbAeENqK X-Received: by 2002:ad4:5f89:0:b0:670:fa29:eb51 with SMTP id jp9-20020ad45f89000000b00670fa29eb51mr35086442qvb.12.1699360123703; Tue, 07 Nov 2023 04:28:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699360123; cv=none; d=google.com; s=arc-20160816; b=MqyCUAZ3FkUv2mT/a/F43OeoCFMDiBAbw+3u4zXfk1BORmZoLQRIsR1XzMDpyDLmvC nVaZdT3SPfZPsSpHTB628zpTwXAW6TUoN/qnSrGWfKprTTDWVu7YvL48lwPk7+mI7Nss en/i7bedvxFlhk601lHMf54VESPCrF323FibSTmKBNxxyHRL0aDm+5EBNho5BM4sdC3d X0XzZDK1dkzRhGd5rvQ90Y7ymX4zRn6v9u62Qt4dnTqIOZxKux+w4n5YNl6eADgqfLLf SV9OGNcyluazFDHRW08yXpVY5Id1Jib7k86aUfKkiE1WSe3qzE1HXuCnOQEgKWu2XeN7 33gg== 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=UxnI5l2WrvXzGWFNPDGJXP6PFry6juDuplDEP4dg9mo=; fh=zqCJK/GNKinD327RpwX+nzDujFsGQ+TAosBHb+QbdKo=; b=wltdPf06o0FzCfjC4jUZzBaLtYu7nTubgI6uH1YFJSJICZVftHZLds1FWrnMrozNQw JnP+5jAnfCB7PNtKA0pGtnga6f449sQSJN2b0S8bgYIeP6MqJ/DoT2SX98DjZJFjcER0 OgDQz24hG5njN5/R38yNumLEq0+EfGj6k9dhYGj0ZpVcCfmyL+BPzIo3ZT6G04TMkkek 5noVW7L4hNjqrQku40SUZ4zmDLLygL5t6vrg0/oBaI4U666HmclB4lIFGtY21BIlHPi7 pL6r8PH9lk29UyajkcgDZlN/IzyGTMnTIVPnpFuxxpbzAsQWpHyd2rSgVSkjr86gYlra KkKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uvFaXAlb; 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 c6-20020a05621401c600b0067540fd3ebasi6615270qvt.269.2023.11.07.04.28.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2023 04:28:43 -0800 (PST) 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=uvFaXAlb; 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 1r0L98-0005n1-79; Tue, 07 Nov 2023 07:25:30 -0500 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 1r0L95-0005ho-HJ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 07:25:27 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r0L8o-0004so-IQ for qemu-devel@nongnu.org; Tue, 07 Nov 2023 07:25:27 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-4084b0223ccso40723675e9.2 for ; Tue, 07 Nov 2023 04:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699359909; x=1699964709; 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=UxnI5l2WrvXzGWFNPDGJXP6PFry6juDuplDEP4dg9mo=; b=uvFaXAlbTD379AqDpzf2RuvSSg/B3IUDqFXxKNUMDaHwUKROqW5G6RBHIJF8Y6pY6u RwsXoJflvDktMUYpGZX1aocKFVVG8f9gsxt8covcgQ6XwzP019l2482uQ2Giwbm4d26Q ej4joL7l23BIcufuSkxaHM6RES0l1pBVr8vxK9jrcsuQzWvodFKip4EsmexvOppsuZZw +PFoSiXZV3pJE8DahoR+V/QBvdDnkNR0T3s/RSuoz8E+n7flkzUuYmNIchxQWCHTqks5 3TNdTDrh4H0kTuphjqY+qkfenlVbU2ZpSp3G97Ts8IIH3qvlc8iZAtEZ0vjOZ3MNMIpJ tSOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699359909; x=1699964709; 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=UxnI5l2WrvXzGWFNPDGJXP6PFry6juDuplDEP4dg9mo=; b=WKntkLsAuhFWC+iGCkDjazf1Np6VzML0la29ib2jMFPZUVcLU4XUBT9xecliKnEy33 yaRuKWbi+SYBRL+EzngcerLdFXpAfcxV8fabq+sJTCvf8eeZexmYesHrKY128w5j8QQw wZTMjQgSdrvAp8iLl2EHvN2dF1mBzomQ4NY80XOI6DROP4QMTpWMG3ScjBZ2UGyRTxnA z7kr08WusZ4+mfuDhNSQUHdZwVs3njxiXSMetA5gg6JpNT6epeKAHyLMB8usYlELSrWM OwPICu8oULoddYiAP+binWxXj8xOkk/KHTdJ6m6Z7pHXHxbq/XG3oU7K8O8xNsGTx5e6 VzVg== X-Gm-Message-State: AOJu0YzFJARKuFnrDAj9vheiuQSMTjquIFZOa11KMAgHozOixxaNtjkY hsVrmV3+wlgebm3TQ3TwFJn/KNzYnshXNs59RLk= X-Received: by 2002:adf:f1d0:0:b0:32d:84e8:eef2 with SMTP id z16-20020adff1d0000000b0032d84e8eef2mr22297913wro.33.1699359908952; Tue, 07 Nov 2023 04:25:08 -0800 (PST) Received: from m1x-phil.lan ([176.187.216.69]) by smtp.gmail.com with ESMTPSA id t11-20020a5d49cb000000b003248a490e3asm2215974wrs.39.2023.11.07.04.25.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Nov 2023 04:25:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org, qemu-s390x@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Richard Henderson , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Nicholas Piggin , Daniel Henrique Barboza Subject: [PULL 39/75] target/ppc: Move powerpc_excp_t definition to 'cpu.h' Date: Tue, 7 Nov 2023 13:24:29 +0100 Message-ID: <20231107122442.58674-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231107122442.58674-1-philmd@linaro.org> References: <20231107122442.58674-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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 The powerpc_excp_t definition is only used by target/ppc/, no need to expose it. Restrict it by moving it to "target/ppc/cpu.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Cédric Le Goater Message-Id: <20231013125630.95116-6-philmd@linaro.org> --- target/ppc/cpu-qom.h | 29 ----------------------------- target/ppc/cpu.h | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 65a640470f..acc5f1a1dc 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -78,35 +78,6 @@ static inline bool mmu_is_64bit(powerpc_mmu_t mmu_model) return mmu_model & POWERPC_MMU_64; } -/*****************************************************************************/ -/* Exception model */ -typedef enum powerpc_excp_t powerpc_excp_t; -enum powerpc_excp_t { - POWERPC_EXCP_UNKNOWN = 0, - /* Standard PowerPC exception model */ - POWERPC_EXCP_STD, - /* PowerPC 40x exception model */ - POWERPC_EXCP_40x, - /* PowerPC 603/604/G2 exception model */ - POWERPC_EXCP_6xx, - /* PowerPC 7xx exception model */ - POWERPC_EXCP_7xx, - /* PowerPC 74xx exception model */ - POWERPC_EXCP_74xx, - /* BookE exception model */ - POWERPC_EXCP_BOOKE, - /* PowerPC 970 exception model */ - POWERPC_EXCP_970, - /* POWER7 exception model */ - POWERPC_EXCP_POWER7, - /* POWER8 exception model */ - POWERPC_EXCP_POWER8, - /* POWER9 exception model */ - POWERPC_EXCP_POWER9, - /* POWER10 exception model */ - POWERPC_EXCP_POWER10, -}; - /*****************************************************************************/ /* Input pins model */ typedef enum powerpc_input_t powerpc_input_t; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 55330d9319..94a804a605 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -192,6 +192,33 @@ enum { POWERPC_EXCP_TRAP = 0x40, }; +/* Exception model */ +typedef enum powerpc_excp_t { + POWERPC_EXCP_UNKNOWN = 0, + /* Standard PowerPC exception model */ + POWERPC_EXCP_STD, + /* PowerPC 40x exception model */ + POWERPC_EXCP_40x, + /* PowerPC 603/604/G2 exception model */ + POWERPC_EXCP_6xx, + /* PowerPC 7xx exception model */ + POWERPC_EXCP_7xx, + /* PowerPC 74xx exception model */ + POWERPC_EXCP_74xx, + /* BookE exception model */ + POWERPC_EXCP_BOOKE, + /* PowerPC 970 exception model */ + POWERPC_EXCP_970, + /* POWER7 exception model */ + POWERPC_EXCP_POWER7, + /* POWER8 exception model */ + POWERPC_EXCP_POWER8, + /* POWER9 exception model */ + POWERPC_EXCP_POWER9, + /* POWER10 exception model */ + POWERPC_EXCP_POWER10, +} powerpc_excp_t; + #define PPC_INPUT(env) ((env)->bus_model) /*****************************************************************************/