Date: Fri, 20 Sep 2002 19:03:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17796 for review Message-ID: <200209210203.g8L2326O080266@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17796 Change 17796 by peter@peter_daintree on 2002/09/20 19:02:47 zap math_emulate Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#2 (text+ko) ==== @@ -154,7 +154,6 @@ }; int kdb_trap(int, int, struct trapframe *); -extern int (*pmath_emulate)(struct trapframe *); #define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_cpu.h" #include "opt_debug_npx.h" #include "opt_isa.h" -#include "opt_math_emulate.h" #include "opt_npx.h" #include <sys/param.h> ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#2 (text+ko) ==== @@ -101,8 +101,6 @@ #include <sys/sysctl.h> -int (*pmath_emulate)(struct trapframe *); - extern void trap(struct trapframe frame); #ifdef I386_CPU extern int trapwrite(unsigned addr); @@ -409,21 +407,8 @@ if (npxdna()) goto userout; #endif - if (!pmath_emulate) { - i = SIGFPE; - ucode = FPE_FPU_NP_TRAP; - break; - } - mtx_lock(&Giant); - i = (*pmath_emulate)(&frame); - mtx_unlock(&Giant); - if (i == 0) { - if (!(frame.tf_eflags & PSL_T)) - goto userout; - frame.tf_eflags &= ~PSL_T; - i = SIGTRAP; - } - /* else ucode = emulator_only_knows() XXX */ + i = SIGFPE; + ucode = FPE_FPU_NP_TRAP; break; case T_FPOPFLT: /* FPU operand fetch fault */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209210203.g8L2326O080266>