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

merge

Browse source
This commit is contained in:
cinap_lenrek 2020-12-21 15:06:04 +01:00
commit 262d5c101b
5 changed files with 69 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/src/9/pc/fns.h
View file

@ -17,6 +17,10 @@ int cmpswap486(long*, long, long);
void (*coherence)(void);
void cpuid(int, int, ulong regs[]);
void fpuinit(void);
void fpuprocsetup(Proc*);
void fpuprocfork(Proc*);
void fpuprocsave(Proc*);
void fpuprocrestore(Proc*);
int cpuidentify(void);
void cpuidprint(void);
void (*cycles)(uvlong*);

51
sys/src/9/pc/fpu.c
View file

@ -307,3 +307,54 @@ fpuinit(void)
fprestore = fpx87restore;
}
}
void
fpuprocsetup(Proc *p)
{
p->fpstate = FPinit;
fpoff();
}
void
fpuprocfork(Proc *p)
{
int s;
s = splhi();
switch(up->fpstate & ~FPillegal){
case FPactive:
fpsave(up->fpsave);
up->fpstate = FPinactive;
case FPinactive:
while(p->fpsave == nil)
p->fpsave = mallocalign(sizeof(FPsave), FPalign, 0, 0);
memmove(p->fpsave, up->fpsave, sizeof(FPsave));
p->fpstate = FPinactive;
}
splx(s);
}
void
fpuprocsave(Proc *p)
{
if(p->fpstate == FPactive){
if(p->state == Moribund)
fpclear();
else{
/*
* Fpsave() stores without handling pending
* unmasked exeptions. Postnote() can't be called
* so the handling of pending exceptions is delayed
* until the process runs again and generates an
* emulation fault to activate the FPU.
*/
fpsave(p->fpsave);
}
p->fpstate = FPinactive;
}
}
void
fpuprocrestore(Proc*)
{
}

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

@ -233,14 +233,10 @@ confinit(void)
}
}
/*
* set up floating point for a new process
*/
void
procsetup(Proc *p)
{
p->fpstate = FPinit;
fpoff();
fpuprocsetup(p);
memset(p->gdt, 0, sizeof(p->gdt));
p->nldt = 0;
@ -256,8 +252,6 @@ procsetup(Proc *p)
void
procfork(Proc *p)
{
int s;
/* inherit user descriptors */
memmove(p->gdt, up->gdt, sizeof(p->gdt));
@ -268,19 +262,7 @@ procfork(Proc *p)
p->nldt = up->nldt;
}
/* save floating point state */
s = splhi();
switch(up->fpstate & ~FPillegal){
case FPactive:
fpsave(up->fpsave);
up->fpstate = FPinactive;
case FPinactive:
while(p->fpsave == nil)
p->fpsave = mallocalign(sizeof(FPsave), FPalign, 0, 0);
memmove(p->fpsave, up->fpsave, sizeof(FPsave));
p->fpstate = FPinactive;
}
splx(s);
fpuprocfork(p);
}
void
@ -293,6 +275,8 @@ procrestore(Proc *p)
if(p->vmx != nil)
vmxprocrestore(p);
fpuprocrestore(p);
}
/*
@ -309,21 +293,7 @@ procsave(Proc *p)
if(p->state == Moribund)
p->dr[7] = 0;
if(p->fpstate == FPactive){
if(p->state == Moribund)
fpclear();
else{
/*
* Fpsave() stores without handling pending
* unmasked exeptions. Postnote() can't be called
* so the handling of pending exceptions is delayed
* until the process runs again and generates an
* emulation fault to activate the FPU.
*/
fpsave(p->fpsave);
}
p->fpstate = FPinactive;
}
fpuprocsave(p);
/*
* While this processor is in the scheduler, the process could run

4
sys/src/9/xen/fns.h
View file

@ -11,6 +11,10 @@ int cmpswap486(long*, long, long);
void (*coherence)(void);
void cpuid(int, int, ulong regs[]);
void fpuinit(void);
void fpuprocsetup(Proc*);
void fpuprocfork(Proc*);
void fpuprocsave(Proc*);
void fpuprocrestore(Proc*);
int cpuidentify(void);
void cpuidprint(void);
void (*cycles)(uvlong*);

41
sys/src/9/xen/main.c
View file

@ -322,39 +322,22 @@ confinit(void)
}
}
/*
* set up floating point for a new process
*/
void
procsetup(Proc*p)
procsetup(Proc *p)
{
p->fpstate = FPinit;
fpoff();
fpuprocsetup(p);
}
void
procfork(Proc *p)
{
int s;
/* save floating point state */
s = splhi();
switch(up->fpstate & ~FPillegal){
case FPactive:
fpsave(up->fpsave);
up->fpstate = FPinactive;
case FPinactive:
while(p->fpsave == nil)
p->fpsave = mallocalign(sizeof(FPsave), FPalign, 0, 0);
memmove(p->fpsave, up->fpsave, sizeof(FPsave));
p->fpstate = FPinactive;
}
splx(s);
fpuprocfork(p);
}
void
procrestore(Proc *p)
{
fpuprocrestore(p);
}
/*
@ -363,21 +346,7 @@ procrestore(Proc *p)
void
procsave(Proc *p)
{
if(p->fpstate == FPactive){
if(p->state == Moribund)
fpclear();
else{
/*
* Fpsave() stores without handling pending
* unmasked exeptions. Postnote() can't be called
* so the handling of pending exceptions is delayed
* until the process runs again and generates an
* emulation fault to activate the FPU.
*/
fpsave(p->fpsave);
}
p->fpstate = FPinactive;
}
fpuprocsave(p);
/*
* While this processor is in the scheduler, the process could run