diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-09-29 07:34:43 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-09-29 07:34:43 +0000 |
| commit | 4ee9b02e4ff2aca8569497a013add163e3752aa0 (patch) | |
| tree | 8a3a06c6ff171f9a9b9125ffac1f2adf1ae1e5e2 | |
| parent | fc9bc83850744177ce1795f5fb6c41a1d3d36e84 (diff) | |
Do not count 060SP traps; there are too many of them, better handle them
as fast as possible.
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/genassym.cf | 6 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/locore.s | 7 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/machdep.c | 20 |
3 files changed, 3 insertions, 30 deletions
diff --git a/sys/arch/mvme68k/mvme68k/genassym.cf b/sys/arch/mvme68k/mvme68k/genassym.cf index d347edcf688..39dcc1bec80 100644 --- a/sys/arch/mvme68k/mvme68k/genassym.cf +++ b/sys/arch/mvme68k/mvme68k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.19 2004/07/30 09:50:17 miod Exp $ +# $OpenBSD: genassym.cf,v 1.20 2004/09/29 07:34:42 miod Exp $ # # Copyright (c) 1995 Theo de Raadt @@ -62,7 +62,6 @@ include <sys/msgbuf.h> include <sys/syscall.h> include <sys/types.h> include <sys/user.h> -include <sys/evcount.h> include <uvm/uvm_extern.h> @@ -130,6 +129,3 @@ member ctrl member cmd member addr member len - -struct evcount -member ec_count32 diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s index f08a90184e6..a8db2729390 100644 --- a/sys/arch/mvme68k/mvme68k/locore.s +++ b/sys/arch/mvme68k/mvme68k/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.43 2004/07/30 09:50:17 miod Exp $ */ +/* $OpenBSD: locore.s,v 1.44 2004/09/29 07:34:42 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -675,7 +675,6 @@ ENTRY_NOPROFILE(buserr60) orl #IC60_CABC,d2 | clear all branch cache entries movc d2,cacr movl d0,d1 - addql #1, _C_LABEL(ec_60bpe) + EC_COUNT32 andl #0x7ffd,d1 jeq _ASM_LABEL(faultstkadjnotrap2) Lnobpe: @@ -1891,16 +1890,12 @@ not147: #if defined(M68060) && defined(M060SP) GLOBAL(intemu60) - addql #1, _C_LABEL(ec_60iem) + EC_COUNT32 jra _I_CALL_TOP+128+0x00 GLOBAL(fpiemu60) - addql #1, _C_LABEL(ec_60fpiem) + EC_COUNT32 jra _FP_CALL_TOP+128+0x30 GLOBAL(fpdemu60) - addql #1, _C_LABEL(ec_60fpdem) + EC_COUNT32 jra _FP_CALL_TOP+128+0x38 GLOBAL(fpeaemu60) - addql #1, _C_LABEL(ec_60fpeaem) + EC_COUNT32 jra _FP_CALL_TOP+128+0x40 #endif diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 0c9a6d43838..9500076003a 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.86 2004/07/30 22:29:48 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.87 2004/09/29 07:34:42 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -159,13 +159,6 @@ extern struct emul emul_hpux; extern struct emul emul_sunos; #endif -/* 68060-specific event counters */ -#if defined(M68060) -struct evcount ec_60bpe; -#if defined(M060SP) -struct evcount ec_60iem, ec_60fpiem, ec_60fpdem, ec_60fpeaem; -#endif -#endif /* * XXX this is to fake out the console routines, while * booting. New and improved! :-) smurph @@ -608,17 +601,6 @@ identifycpu() #endif } printf("%s\n", cpu_model); - - /* No better place to put these... */ -#if defined(M68060) - evcount_attach(&ec_60bpe, "68060bpe", NULL, &evcount_intr); -#if defined(M060SP) - evcount_attach(&ec_60iem, "68060iem", NULL, &evcount_intr); - evcount_attach(&ec_60fpiem, "68060fpiem", NULL, &evcount_intr); - evcount_attach(&ec_60fpdem, "68060fpdem", NULL, &evcount_intr); - evcount_attach(&ec_60fpeaem, "68060fpeaem", NULL, &evcount_intr); -#endif -#endif } /* |