From f4e1d0bf9f89be80559653766892d69d54eedf93 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Wed, 28 May 2025 12:18:51 -0700 Subject: [PATCH] kern: move spendsgir static assert --- .../mesosphere/arch/arm/kern_generic_interrupt_controller.hpp | 1 + .../source/arch/arm/kern_generic_interrupt_controller.inc | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/libmesosphere/include/mesosphere/arch/arm/kern_generic_interrupt_controller.hpp b/libraries/libmesosphere/include/mesosphere/arch/arm/kern_generic_interrupt_controller.hpp index a3c28eaa9..a44c92218 100644 --- a/libraries/libmesosphere/include/mesosphere/arch/arm/kern_generic_interrupt_controller.hpp +++ b/libraries/libmesosphere/include/mesosphere/arch/arm/kern_generic_interrupt_controller.hpp @@ -118,6 +118,7 @@ namespace ams::kern::arch::arm { u32 icfgr[NumLocalInterrupts / 16]; u32 spendsgir[4]; }; + static_assert(sizeof(LocalState{}.spendsgir) == sizeof(GicDistributor{}.spendsgir)); struct GlobalState { u32 isenabler[NumGlobalInterrupts / 32]; diff --git a/libraries/libmesosphere/source/arch/arm/kern_generic_interrupt_controller.inc b/libraries/libmesosphere/source/arch/arm/kern_generic_interrupt_controller.inc index 9fa5ffb38..e7f2eb4fa 100644 --- a/libraries/libmesosphere/source/arch/arm/kern_generic_interrupt_controller.inc +++ b/libraries/libmesosphere/source/arch/arm/kern_generic_interrupt_controller.inc @@ -115,7 +115,6 @@ namespace ams::kern::arch::arm { } /* Save spendsgir. */ - static_assert(util::size(state->spendsgir) == util::size(m_gicd->spendsgir)); for (size_t i = 0; i < util::size(state->spendsgir); ++i) { state->spendsgir[i] = m_gicd->spendsgir[i]; } @@ -176,7 +175,6 @@ namespace ams::kern::arch::arm { } /* Restore spendsgir. */ - static_assert(util::size(state->spendsgir) == util::size(m_gicd->spendsgir)); for (size_t i = 0; i < util::size(state->spendsgir); ++i) { m_gicd->spendsgir[i] = state->spendsgir[i]; }