[src/trunk]: src/sys/arch/arm Rename pcb_sp/PCB_SP to pcb_ksp/PCB_KSP so that...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/arm Rename pcb_sp/PCB_SP to pcb_ksp/PCB_KSP so that...
From: matt <matt%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:58:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/8afbc6420288
branches:  trunk
changeset: 783181:8afbc6420288
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Dec 10 01:37:30 2012 +0000

description:
Rename pcb_sp/PCB_SP to pcb_ksp/PCB_KSP so that ipsec.c will compile.

diffstat:

 sys/arch/arm/arm32/arm32_machdep.c |   8 ++++----
 sys/arch/arm/arm32/cpuswitch.S     |   8 ++++----
 sys/arch/arm/arm32/fault.c         |   6 +++---
 sys/arch/arm/arm32/genassym.cf     |   4 ++--
 sys/arch/arm/arm32/vm_machdep.c    |  10 +++++-----
 sys/arch/arm/include/pcb.h         |   4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diffs (176 lines):

diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/arm32/arm32_machdep.c
--- a/sys/arch/arm/arm32/arm32_machdep.c        Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/arm32/arm32_machdep.c        Mon Dec 10 01:37:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_machdep.c,v 1.85 2012/10/27 17:17:36 chs Exp $   */
+/*     $NetBSD: arm32_machdep.c,v 1.86 2012/12/10 01:37:30 matt Exp $  */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.85 2012/10/27 17:17:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.86 2012/12/10 01:37:30 matt Exp $");
 
 #include "opt_modular.h"
 #include "opt_md.h"
@@ -268,8 +268,8 @@
 
        struct lwp * const l = &lwp0;
        struct pcb * const pcb = lwp_getpcb(l);
-       pcb->pcb_sp = uvm_lwp_getuarea(l) + USPACE_SVC_STACK_TOP;
-       lwp_settrapframe(l, (struct trapframe *)pcb->pcb_sp - 1);
+       pcb->pcb_ksp = uvm_lwp_getuarea(l) + USPACE_SVC_STACK_TOP;
+       lwp_settrapframe(l, (struct trapframe *)pcb->pcb_ksp - 1);
 }
 
 /*
diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/arm32/cpuswitch.S
--- a/sys/arch/arm/arm32/cpuswitch.S    Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/arm32/cpuswitch.S    Mon Dec 10 01:37:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuswitch.S,v 1.74 2012/12/05 19:05:45 matt Exp $      */
+/*     $NetBSD: cpuswitch.S,v 1.75 2012/12/10 01:37:30 matt Exp $      */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
 #include <machine/asm.h>
 #include <machine/cpu.h>
 
-       RCSID("$NetBSD: cpuswitch.S,v 1.74 2012/12/05 19:05:45 matt Exp $")
+       RCSID("$NetBSD: cpuswitch.S,v 1.75 2012/12/10 01:37:30 matt Exp $")
 
 /* LINTSTUB: include <sys/param.h> */
        
@@ -258,7 +258,7 @@
        ldr     r10, [r7, #(PCB_R10)]
        ldr     r11, [r7, #(PCB_R11)]
        ldr     r12, [r7, #(PCB_R12)]
-       ldr     r13, [r7, #(PCB_SP)]
+       ldr     r13, [r7, #(PCB_KSP)]
 #elif defined(_ARM_ARCH_6)
        ldrd    r8, [r7, #(PCB_R8)]
        ldrd    r10, [r7, #(PCB_R10)]
@@ -430,7 +430,7 @@
        mcr     p15, 0, r4, c13, c0, 4          /* restore pinned lwp */
 #endif
        str     r4, [r7, #(CI_CURLWP)]          /* restore pinned lwp */
-       ldr     sp, [r2, #(PCB_SP)]     /* now running on the old stack. */
+       ldr     sp, [r2, #(PCB_KSP)]    /* now running on the old stack. */
 
        /* At this point we can allow IRQ's again. */
        msr     cpsr_c, r6
diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/arm32/fault.c
--- a/sys/arch/arm/arm32/fault.c        Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/arm32/fault.c        Mon Dec 10 01:37:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $ */
+/*     $NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
 #include "opt_kgdb.h"
 
 #include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.86 2012/11/12 18:00:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fault.c,v 1.87 2012/12/10 01:37:30 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -642,7 +642,7 @@
                 * If the current trapframe is at the top of the kernel stack,
                 * the fault _must_ have come from user mode.
                 */
-               if (tf != ((trapframe_t *)pcb->pcb_sp) - 1) {
+               if (tf != ((trapframe_t *)pcb->pcb_ksp) - 1) {
                        /*
                         * Kernel mode. We're either about to die a
                         * spectacular death, or pcb_onfault will come
diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/arm32/genassym.cf
--- a/sys/arch/arm/arm32/genassym.cf    Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/arm32/genassym.cf    Mon Dec 10 01:37:30 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.56 2012/10/21 15:46:00 matt Exp $
+#      $NetBSD: genassym.cf,v 1.57 2012/12/10 01:37:30 matt Exp $
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -130,7 +130,7 @@
 define PCB_R10                 offsetof(struct pcb, pcb_un.un_32.pcb32_r10)
 define PCB_R11                 offsetof(struct pcb, pcb_un.un_32.pcb32_r11)
 define PCB_R12                 offsetof(struct pcb, pcb_un.un_32.pcb32_r12)
-define PCB_SP                  offsetof(struct pcb, pcb_un.un_32.pcb32_sp)
+define PCB_KSP                 offsetof(struct pcb, pcb_un.un_32.pcb32_sp)
 define PCB_LR                  offsetof(struct pcb, pcb_un.un_32.pcb32_lr)
 define PCB_PC                  offsetof(struct pcb, pcb_un.un_32.pcb32_pc)
 define PCB_USER_PID_RW         offsetof(struct pcb, pcb_un.un_32.pcb32_user_pid_rw)
diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/arm32/vm_machdep.c
--- a/sys/arch/arm/arm32/vm_machdep.c   Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/arm32/vm_machdep.c   Mon Dec 10 01:37:30 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vm_machdep.c,v 1.62 2012/12/05 19:05:45 matt Exp $     */
+/*     $NetBSD: vm_machdep.c,v 1.63 2012/12/10 01:37:31 matt Exp $     */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.62 2012/12/05 19:05:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.63 2012/12/10 01:37:31 matt Exp $");
 
 #include "opt_armfpe.h"
 #include "opt_pmap_debug.h"
@@ -143,7 +143,7 @@
         * Note: this stack is not in use if we are forking from p1
         */
        uv = uvm_lwp_getuarea(l2);
-       pcb2->pcb_sp = uv + USPACE_SVC_STACK_TOP;
+       pcb2->pcb_ksp = uv + USPACE_SVC_STACK_TOP;
 
 #ifdef STACKCHECKS
        /* Fill the kernel stack with a known pattern */
@@ -160,7 +160,7 @@
        }
 #endif /* PMAP_DEBUG */
 
-       struct trapframe *tf = (struct trapframe *)pcb2->pcb_sp - 1;
+       struct trapframe *tf = (struct trapframe *)pcb2->pcb_ksp - 1;
        lwp_settrapframe(l2, tf);
        *tf = *lwp_trapframe(l1);
 
@@ -177,7 +177,7 @@
        sf->sf_r7 = PSR_USR32_MODE;             /* for returning to userspace */
        sf->sf_sp = (u_int)tf;
        sf->sf_pc = (u_int)lwp_trampoline;
-       pcb2->pcb_sp = (u_int)sf;
+       pcb2->pcb_ksp = (u_int)sf;
 }
 
 /*
diff -r 02bb42e8520e -r 8afbc6420288 sys/arch/arm/include/pcb.h
--- a/sys/arch/arm/include/pcb.h        Mon Dec 10 01:35:28 2012 +0000
+++ b/sys/arch/arm/include/pcb.h        Mon Dec 10 01:37:30 2012 +0000
@@ -71,7 +71,7 @@
 #define        pcb_cstate      pcb_un.un_32.pcb32_cstate
 #define        pcb_user_pid_rw pcb_un.un_32.pcb32_user_pid_rw
 #ifdef __PROG32
-#define        pcb_sp          pcb_un.un_32.pcb32_sp
+#define        pcb_ksp         pcb_un.un_32.pcb32_sp
 #endif
 
 struct pcb_arm26 {
@@ -79,7 +79,7 @@
 };
 #define        pcb_sf  pcb_un.un_26.pcb26_sf
 #ifdef __PROG26
-#define        pcb_sp          pcb_sf.sf_r13
+#define        pcb_ksp         pcb_sf.sf_r13
 #endif
 
 /*
Prev by Date: [src/trunk]: src/sys/net/npf npf_rwrcksum: handle delayed checksums in the ne...
Next by Date: [src/trunk]: src/sys/arch/i386/conf whitespace
Previous by Thread: [src/trunk]: src/sys/net/npf npf_rwrcksum: handle delayed checksums in the ne...
Next by Thread: [src/trunk]: src/sys/arch/i386/conf whitespace
Indexes:
Home | Main Index | Thread Index | Old Index