diff options
| -rw-r--r-- | sys/powerpc/aim/swtch.S | 14 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/swtch.S | 14 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/swtch.s | 14 |
3 files changed, 6 insertions, 36 deletions
diff --git a/sys/powerpc/aim/swtch.S b/sys/powerpc/aim/swtch.S index 875328e..a9df7ea 100644 --- a/sys/powerpc/aim/swtch.S +++ b/sys/powerpc/aim/swtch.S @@ -106,16 +106,6 @@ ENTRY(cpu_switch) mfsprg %r4,0 /* Get the pcpu pointer */ stw %r16,PC_CURTHREAD(%r4) /* Store new current thread */ - lwz %r15,TD_PROC(%r16) /* Grab the current thread's proc */ - lwz %r15,P_VMSPACE(%r15) /* Grab the current proc's vmspace */ - lwz %r15,VM_PMAP(%r15) /* ... pmap */ - mr %r3,%r15 - bl pmap_kextract - cmpwi cr4,%r3,0 - bne cr4,.L2 - mr %r3,%r15 -.L2: - stw %r3,PC_CURPMAP(%r4) /* Store it */ lwz %r16,TD_PCB(%r16) /* Grab the new PCB */ stw %r16,PC_CURPCB(%r4) mr %r4,%r16 @@ -123,12 +113,12 @@ ENTRY(cpu_switch) #if 0 lwz %r29, PCB_FLAGS(%r4) /* Restore FPU regs if needed */ andi. %r9, %r29, 1 - beq .L3 + beq .L2 mr %r3, %r4 bl enable_fpu #endif -.L3: +.L2: lmw %r14,PCB_CONTEXT(%r4) /* Load the non-volatile GP regs */ lwz %r5,PCB_CR(%r4) /* Load the condition register */ mtcr %r5 diff --git a/sys/powerpc/powerpc/swtch.S b/sys/powerpc/powerpc/swtch.S index 875328e..a9df7ea 100644 --- a/sys/powerpc/powerpc/swtch.S +++ b/sys/powerpc/powerpc/swtch.S @@ -106,16 +106,6 @@ ENTRY(cpu_switch) mfsprg %r4,0 /* Get the pcpu pointer */ stw %r16,PC_CURTHREAD(%r4) /* Store new current thread */ - lwz %r15,TD_PROC(%r16) /* Grab the current thread's proc */ - lwz %r15,P_VMSPACE(%r15) /* Grab the current proc's vmspace */ - lwz %r15,VM_PMAP(%r15) /* ... pmap */ - mr %r3,%r15 - bl pmap_kextract - cmpwi cr4,%r3,0 - bne cr4,.L2 - mr %r3,%r15 -.L2: - stw %r3,PC_CURPMAP(%r4) /* Store it */ lwz %r16,TD_PCB(%r16) /* Grab the new PCB */ stw %r16,PC_CURPCB(%r4) mr %r4,%r16 @@ -123,12 +113,12 @@ ENTRY(cpu_switch) #if 0 lwz %r29, PCB_FLAGS(%r4) /* Restore FPU regs if needed */ andi. %r9, %r29, 1 - beq .L3 + beq .L2 mr %r3, %r4 bl enable_fpu #endif -.L3: +.L2: lmw %r14,PCB_CONTEXT(%r4) /* Load the non-volatile GP regs */ lwz %r5,PCB_CR(%r4) /* Load the condition register */ mtcr %r5 diff --git a/sys/powerpc/powerpc/swtch.s b/sys/powerpc/powerpc/swtch.s index 875328e..a9df7ea 100644 --- a/sys/powerpc/powerpc/swtch.s +++ b/sys/powerpc/powerpc/swtch.s @@ -106,16 +106,6 @@ ENTRY(cpu_switch) mfsprg %r4,0 /* Get the pcpu pointer */ stw %r16,PC_CURTHREAD(%r4) /* Store new current thread */ - lwz %r15,TD_PROC(%r16) /* Grab the current thread's proc */ - lwz %r15,P_VMSPACE(%r15) /* Grab the current proc's vmspace */ - lwz %r15,VM_PMAP(%r15) /* ... pmap */ - mr %r3,%r15 - bl pmap_kextract - cmpwi cr4,%r3,0 - bne cr4,.L2 - mr %r3,%r15 -.L2: - stw %r3,PC_CURPMAP(%r4) /* Store it */ lwz %r16,TD_PCB(%r16) /* Grab the new PCB */ stw %r16,PC_CURPCB(%r4) mr %r4,%r16 @@ -123,12 +113,12 @@ ENTRY(cpu_switch) #if 0 lwz %r29, PCB_FLAGS(%r4) /* Restore FPU regs if needed */ andi. %r9, %r29, 1 - beq .L3 + beq .L2 mr %r3, %r4 bl enable_fpu #endif -.L3: +.L2: lmw %r14,PCB_CONTEXT(%r4) /* Load the non-volatile GP regs */ lwz %r5,PCB_CR(%r4) /* Load the condition register */ mtcr %r5 |
