d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Access pcpup using gp register.

Browse Source
This commit is contained in:
br 2016-02-04 14:30:46 +00:00
parent 87f75655f4
commit 996520c667
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/riscv/include/asm.h
View File

@ -59,9 +59,7 @@
.set alias,sym .set alias,sym
#define SET_FAULT_HANDLER(handler, tmp) \ #define SET_FAULT_HANDLER(handler, tmp) \
la tmp, pcpup; \ ld tmp, PC_CURTHREAD(gp); \
ld tmp, 0(tmp); \
ld tmp, PC_CURTHREAD(tmp); \
ld tmp, TD_PCB(tmp); /* Load the pcb */ \ ld tmp, TD_PCB(tmp); /* Load the pcb */ \
sd handler, PCB_ONFAULT(tmp) /* Set the handler */ sd handler, PCB_ONFAULT(tmp) /* Set the handler */

4
sys/riscv/riscv/exception.S
View File

@ -182,9 +182,7 @@ __FBSDID("$FreeBSD$");
1: 1:
csrci sstatus, SSTATUS_IE csrci sstatus, SSTATUS_IE
la a1, pcpup ld a1, PC_CURTHREAD(gp)
ld a1, 0(a1)
ld a1, PC_CURTHREAD(a1)
lw a2, TD_FLAGS(a1) lw a2, TD_FLAGS(a1)
li a3, (TDF_ASTPENDING|TDF_NEEDRESCHED) li a3, (TDF_ASTPENDING|TDF_NEEDRESCHED)

14
sys/riscv/riscv/swtch.S
View File

@ -46,14 +46,11 @@ __FBSDID("$FreeBSD$");
* void cpu_throw(struct thread *old, struct thread *new) * void cpu_throw(struct thread *old, struct thread *new)
*/ */
ENTRY(cpu_throw) ENTRY(cpu_throw)
/* Load pcpu */
la x14, pcpup
ld x14, 0(x14)
/* Store the new curthread */ /* Store the new curthread */
sd a1, PC_CURTHREAD(x14) sd a1, PC_CURTHREAD(gp)
/* And the new pcb */ /* And the new pcb */
ld x13, TD_PCB(a1) ld x13, TD_PCB(a1)
sd x13, PC_CURPCB(x14) sd x13, PC_CURPCB(gp)
sfence.vm sfence.vm
@ -103,14 +100,11 @@ END(cpu_throw)
* x3 to x7, x16 and x17 are caller saved * x3 to x7, x16 and x17 are caller saved
*/ */
ENTRY(cpu_switch) ENTRY(cpu_switch)
/* Load pcpu */
la x14, pcpup
ld x14, 0(x14)
/* Store the new curthread */ /* Store the new curthread */
sd a1, PC_CURTHREAD(x14) sd a1, PC_CURTHREAD(gp)
/* And the new pcb */ /* And the new pcb */
ld x13, TD_PCB(a1) ld x13, TD_PCB(a1)
sd x13, PC_CURPCB(x14) sd x13, PC_CURPCB(gp)
/* Save the old context. */ /* Save the old context. */
ld x13, TD_PCB(a0) ld x13, TD_PCB(a0)