Module Name: src Committed By: simonb Date: Tue Nov 16 06:11:52 UTC 2021
Modified Files: src/sys/arch/mips/include: cpuregs.h src/sys/arch/mips/mips: cpu_subr.c Log Message: Use the architecture documented name ULR for the RDHWR user local register. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/arch/mips/include/cpuregs.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/mips/mips/cpu_subr.c 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/mips/include/cpuregs.h diff -u src/sys/arch/mips/include/cpuregs.h:1.115 src/sys/arch/mips/include/cpuregs.h:1.116 --- src/sys/arch/mips/include/cpuregs.h:1.115 Tue Nov 16 06:04:52 2021 +++ src/sys/arch/mips/include/cpuregs.h Tue Nov 16 06:11:52 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuregs.h,v 1.115 2021/11/16 06:04:52 simonb Exp $ */ +/* $NetBSD: cpuregs.h,v 1.116 2021/11/16 06:11:52 simonb Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -880,7 +880,7 @@ #define MIPS_HWR_SYNCI_STEP _(1) /* Address step size for SYNCI */ #define MIPS_HWR_CC _(2) /* Hi-res cycle counter */ #define MIPS_HWR_CCRES _(3) /* Cycle counter resolution */ -#define MIPS_HWR_UL _(29) /* Userlocal */ +#define MIPS_HWR_ULR _(29) /* Userlocal */ #define MIPS_HWR_IMPL30 _(30) /* Implementation dependent use */ #define MIPS_HWR_IMPL31 _(31) /* Implementation dependent use */ @@ -889,7 +889,7 @@ */ #define MIPS_HWRENA_IMPL31 __BIT(MIPS_HWR_IMPL31) #define MIPS_HWRENA_IMPL30 __BIT(MIPS_HWR_IMPL30) -#define MIPS_HWRENA_UL __BIT(MIPS_HWR_UL) +#define MIPS_HWRENA_ULR __BIT(MIPS_HWR_ULR) #define MIPS_HWRENA_CCRES __BIT(MIPS_HWR_CCRES) #define MIPS_HWRENA_CC __BIT(MIPS_HWR_CC) #define MIPS_HWRENA_SYNCI_STEP __BIT(MIPS_HWR_SYNCI_STEP) Index: src/sys/arch/mips/mips/cpu_subr.c diff -u src/sys/arch/mips/mips/cpu_subr.c:1.58 src/sys/arch/mips/mips/cpu_subr.c:1.59 --- src/sys/arch/mips/mips/cpu_subr.c:1.58 Mon Aug 17 15:22:51 2020 +++ src/sys/arch/mips/mips/cpu_subr.c Tue Nov 16 06:11:52 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_subr.c,v 1.58 2020/08/17 15:22:51 skrll Exp $ */ +/* $NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $ */ /*- * Copyright (c) 2010, 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.58 2020/08/17 15:22:51 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $"); #include "opt_cputype.h" #include "opt_ddb.h" @@ -217,7 +217,7 @@ cpu_hwrena_setup(void) if (CPUISMIPSNNR2) { mipsNN_cp0_hwrena_write( - (MIPS_HAS_USERLOCAL ? MIPS_HWRENA_UL : 0) + (MIPS_HAS_USERLOCAL ? MIPS_HWRENA_ULR : 0) | MIPS_HWRENA_CCRES | MIPS_HWRENA_CC | MIPS_HWRENA_SYNCI_STEP