Module Name: src Committed By: ryo Date: Tue Nov 2 11:21:24 UTC 2021
Modified Files: src/sys/arch/powerpc/include: spr.h src/sys/arch/powerpc/include/ibm4xx: cpu.h Log Message: fix build with COPTS=-O0 To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/powerpc/include/spr.h cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/include/ibm4xx/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/powerpc/include/spr.h diff -u src/sys/arch/powerpc/include/spr.h:1.53 src/sys/arch/powerpc/include/spr.h:1.54 --- src/sys/arch/powerpc/include/spr.h:1.53 Mon Jul 6 10:31:23 2020 +++ src/sys/arch/powerpc/include/spr.h Tue Nov 2 11:21:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.53 2020/07/06 10:31:23 rin Exp $ */ +/* $NetBSD: spr.h,v 1.54 2021/11/02 11:21:24 ryo Exp $ */ /* * Copyright (c) 2001, The NetBSD Foundation, Inc. @@ -72,8 +72,8 @@ mfspr64(int reg) } ) #endif /* PPC_OEA64_BRIDGE || _ARCH_PPC64 */ -static __inline uint64_t -mfspr32(int reg) +static __inline __always_inline uint64_t +mfspr32(const int reg) { register_t val; @@ -81,8 +81,8 @@ mfspr32(int reg) return val; } -static __inline void -mtspr32(int reg, uint32_t val) +static __inline __always_inline void +mtspr32(const int reg, uint32_t val) { __asm volatile("mtspr %0,%1" : : "K"(reg), "r"(val)); Index: src/sys/arch/powerpc/include/ibm4xx/cpu.h diff -u src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.26 src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.27 --- src/sys/arch/powerpc/include/ibm4xx/cpu.h:1.26 Mon May 31 14:38:56 2021 +++ src/sys/arch/powerpc/include/ibm4xx/cpu.h Tue Nov 2 11:21:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.26 2021/05/31 14:38:56 simonb Exp $ */ +/* $NetBSD: cpu.h,v 1.27 2021/11/02 11:21:24 ryo Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -90,14 +90,14 @@ extern void intr_init(void); * macros because register address is encoded as immediate * operand. */ -static __inline void -mtdcr(int reg, uint32_t val) +static __inline __always_inline void +mtdcr(const int reg, uint32_t val) { __asm volatile("mtdcr %0,%1" : : "K"(reg), "r"(val)); } -static __inline uint32_t -mfdcr(int reg) +static __inline __always_inline uint32_t +mfdcr(const int reg) { uint32_t val;