summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2024-10-22 12:51:57 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2024-10-22 12:51:57 +0000
commit1fcef059dd9f91b213c39abd10f7eb0447aab89a (patch)
tree230969ddcb8b62e2fb02f0ed6407dee8429c218c /sys/arch
parent584b4bfeb21cf745635eab17f90cb3d3bfd7eb3f (diff)
Rename `ci_intrdepth' to `ci_idepth'.
ok gkoehler@, jsg@
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/macppc/macppc/cpu.c4
-rw-r--r--sys/arch/macppc/macppc/genassym.cf4
-rw-r--r--sys/arch/macppc/macppc/locore.S16
-rw-r--r--sys/arch/macppc/macppc/locore0.S4
-rw-r--r--sys/arch/powerpc/include/cpu.h4
-rw-r--r--sys/arch/powerpc/powerpc/intr.c6
6 files changed, 19 insertions, 19 deletions
diff --git a/sys/arch/macppc/macppc/cpu.c b/sys/arch/macppc/macppc/cpu.c
index d5f776cadda..25a5581ada9 100644
--- a/sys/arch/macppc/macppc/cpu.c
+++ b/sys/arch/macppc/macppc/cpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.c,v 1.88 2024/07/21 16:46:56 jca Exp $ */
+/* $OpenBSD: cpu.c,v 1.89 2024/10/22 12:51:56 mpi Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -199,7 +199,7 @@ cpuattach(struct device *parent, struct device *dev, void *aux)
ci = &cpu_info[reg[0]];
ci->ci_cpuid = reg[0];
- ci->ci_intrdepth = -1;
+ ci->ci_idepth = -1;
ci->ci_dev = dev;
hwcap = PPC_FEATURE_32 | PPC_FEATURE_HAS_FPU | PPC_FEATURE_HAS_MMU;
diff --git a/sys/arch/macppc/macppc/genassym.cf b/sys/arch/macppc/macppc/genassym.cf
index 21aaab54651..83c57a7867c 100644
--- a/sys/arch/macppc/macppc/genassym.cf
+++ b/sys/arch/macppc/macppc/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.27 2024/10/21 22:04:13 jsg Exp $
+# $OpenBSD: genassym.cf,v 1.28 2024/10/22 12:51:56 mpi Exp $
#
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -87,7 +87,7 @@ member ci_want_resched
member ci_cpl
member ci_flags
export CI_FLAGS_SLEEPING
-member ci_intrdepth
+member ci_idepth
member ci_intstk
member ci_tempsave
member ci_ddbsave
diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S
index d1c59bf5979..fce979326d0 100644
--- a/sys/arch/macppc/macppc/locore.S
+++ b/sys/arch/macppc/macppc/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.64 2023/12/12 07:37:21 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.65 2024/10/22 12:51:56 mpi Exp $ */
/* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */
/*
@@ -367,9 +367,9 @@ nop32_5e:
mflr %r28 /* save LR */
mfcr %r29 /* save CR */
mfxer %r30 /* save XER */
- lwz %r31,CI_INTRDEPTH(%r1) /* were we already running on intstk? */
+ lwz %r31,CI_IDEPTH(%r1) /* were we already running on intstk? */
addic. %r31,%r31,1
- stw %r31,CI_INTRDEPTH(%r1)
+ stw %r31,CI_IDEPTH(%r1)
lwz %r1,CI_INTSTK(%r1) /* get interrupt stack */
beq 1f
mfsprg %r1,1 /* yes, get old SP */
@@ -395,9 +395,9 @@ nop32_6e:
mflr %r28 /* save LR */
mfcr %r29 /* save CR */
mfxer %r30 /* save XER */
- lwz %r31,CI_INTRDEPTH(%r1) /* were we already running on intstk? */
+ lwz %r31,CI_IDEPTH(%r1) /* were we already running on intstk? */
addic. %r31,%r31,1
- stw %r31,CI_INTRDEPTH(%r1)
+ stw %r31,CI_IDEPTH(%r1)
lwz %r1,CI_INTSTK(%r1) /* get interrupt stack */
beq 1f
mfsprg %r1,1 /* yes, get old SP */
@@ -971,7 +971,7 @@ s_isitrap:
GET_CPUINFO(%r4); \
lmw %r28,CI_TEMPSAVE(%r4); /* restore r28-r31 */ \
mfctr %r6; \
- lwz %r5,CI_INTRDEPTH(%r4); \
+ lwz %r5,CI_IDEPTH(%r4); \
mfsrr0 %r4; \
mfsrr1 %r3; \
stw %r6,28(%r1); \
@@ -1032,9 +1032,9 @@ intr_exit:
mtxer %r3
GET_CPUINFO(%r5)
- lwz %r4,CI_INTRDEPTH(%r5)
+ lwz %r4,CI_IDEPTH(%r5)
addi %r4,%r4,-1 /* adjust reentrancy count */
- stw %r4,CI_INTRDEPTH(%r5)
+ stw %r4,CI_IDEPTH(%r5)
/* Returning to user mode? */
mtcr %r6 /* saved SRR1 */
diff --git a/sys/arch/macppc/macppc/locore0.S b/sys/arch/macppc/macppc/locore0.S
index 287ca6b43a3..33df5dd9b5d 100644
--- a/sys/arch/macppc/macppc/locore0.S
+++ b/sys/arch/macppc/macppc/locore0.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore0.S,v 1.3 2022/12/08 01:25:45 guenther Exp $ */
+/* $OpenBSD: locore0.S,v 1.4 2024/10/22 12:51:56 mpi Exp $ */
/* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */
/*
@@ -114,7 +114,7 @@ start:
addi %r8,%r8,INTSTK
stw %r8,CI_INTSTK(%r9)
li %r0,-1
- stw %r0,CI_INTRDEPTH(%r9)
+ stw %r0,CI_IDEPTH(%r9)
addi %r8,%r8,SPILLSTK+DDBSTK /* leave room for spillstk and ddbstk */
lis %r9,proc0paddr@ha
stw %r8,proc0paddr@l(%r9)
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index ee1ca592215..addcecf9fb0 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.78 2024/06/22 10:22:29 jsg Exp $ */
+/* $OpenBSD: cpu.h,v 1.79 2024/10/22 12:51:56 mpi Exp $ */
/* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */
/*
@@ -65,7 +65,7 @@ struct cpu_info {
struct srp_hazard ci_srp_hazards[SRP_HAZARD_NUM];
#endif
- int ci_intrdepth;
+ int ci_idepth;
char *ci_intstk;
#define CPUSAVE_LEN 8
register_t ci_tempsave[CPUSAVE_LEN];
diff --git a/sys/arch/powerpc/powerpc/intr.c b/sys/arch/powerpc/powerpc/intr.c
index 4b5195bca93..945b6cc91e3 100644
--- a/sys/arch/powerpc/powerpc/intr.c
+++ b/sys/arch/powerpc/powerpc/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.10 2022/07/24 00:28:09 cheloha Exp $ */
+/* $OpenBSD: intr.c,v 1.11 2024/10/22 12:51:56 mpi Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -168,7 +168,7 @@ splassert_check(int wantipl, const char *func)
if (ci->ci_cpl < wantipl)
splassert_fail(wantipl, ci->ci_cpl, func);
- if (wantipl == IPL_NONE && ci->ci_intrdepth != -1)
- splassert_fail(-1, ci->ci_intrdepth, func);
+ if (wantipl == IPL_NONE && ci->ci_idepth != -1)
+ splassert_fail(-1, ci->ci_idepth, func);
}
#endif