xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pc/pc64: keep shadow copy of DR7 in Mach and use that to check whether we need to reset DR7 in procsave(); remove superfluous reset of DR7 in mmurelease()

Browse source
This commit is contained in:
aiju 2017-06-13 00:10:36 +00:00
parent e8082c1d1f
commit 13869bab11
6 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/pc/dat.h
View file

@ -259,6 +259,8 @@ struct Mach
int pdballoc;
int pdbfree;
u32int dr7; /* shadow copy of dr7 */
int stack[1];
};

9
sys/src/9/pc/main.c
View file

@ -844,8 +844,10 @@ procrestore(Proc *p)
{
uvlong t;
if(p->dr[7] != 0)
if(p->dr[7] != 0){
m->dr7 = p->dr[7];
putdr(p->dr);
}
if(p->kp)
return;
@ -863,8 +865,11 @@ procsave(Proc *p)
{
uvlong t;
if(p->dr[7] != 0)
/* we could just always putdr7(0) but accessing DR7 might be slow in a VM */
if(m->dr7 != 0){
m->dr7 = 0;
putdr7(0);
}
cycles(&t);
p->kentry -= t;

2
sys/src/9/pc/mmu.c
View file

@ -387,8 +387,6 @@ mmurelease(Proc* proc)
proc->ldt = nil;
proc->nldt = 0;
}
if(proc->dr[7] != 0)
putdr7(0);
}
/*

2
sys/src/9/pc64/dat.h
View file

@ -224,6 +224,8 @@ struct Mach
int havewatchpt8;
uvlong tscticks;
u64int dr7; /* shadow copy of dr7 */
uintptr stack[1];
};

8
sys/src/9/pc64/main.c
View file

@ -798,8 +798,10 @@ procrestore(Proc *p)
{
uvlong t;
if(p->dr[7] != 0)
if(p->dr[7] != 0){
m->dr7 = p->dr[7];
putdr(p->dr);
}
if(p->kp)
return;
@ -814,8 +816,10 @@ procsave(Proc *p)
{
uvlong t;
if(p->dr[7] != 0)
if(m->dr7 != 0){
m->dr7 = 0;
putdr7(0);
}
cycles(&t);
p->kentry -= t;

2
sys/src/9/pc64/mmu.c
View file

@ -425,8 +425,6 @@ mmurelease(Proc *proc)
proc->kmapcount = proc->kmapindex = 0;
}
mmufree(proc);
if(proc->dr[7] != 0)
putdr7(0);
taskswitch((uintptr)m+MACHSIZE);
}