diff options
author | jhb <jhb@FreeBSD.org> | 2005-12-22 22:16:09 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2005-12-22 22:16:09 +0000 |
commit | cb0d490ebe9e4d2fdb160451bfb076856c76f155 (patch) | |
tree | 5d9826b3ac47ed5cf683fc0866e2dc25566d6a56 /sys/powerpc/include | |
parent | fdec22285a69d07ca0d4320e306828b89e06a8dd (diff) | |
download | FreeBSD-src-cb0d490ebe9e4d2fdb160451bfb076856c76f155.zip FreeBSD-src-cb0d490ebe9e4d2fdb160451bfb076856c76f155.tar.gz |
Tweak how the MD code calls the fooclock() methods some. Instead of
passing a pointer to an opaque clockframe structure and requiring the
MD code to supply CLKF_FOO() macros to extract needed values out of the
opaque structure, just pass the needed values directly. In practice this
means passing the pair (usermode, pc) to hardclock() and profclock() and
passing the boolean (usermode) to hardclock_cpu() and hardclock_process().
Other details:
- Axe clockframe and CLKF_FOO() macros on all architectures. Basically,
all the archs were taking a trapframe and converting it into a clockframe
one way or another. Now they can just extract the PC and usermode values
directly out of the trapframe and pass it to fooclock().
- Renamed hardclock_process() to hardclock_cpu() as the latter is more
accurate.
- On Alpha, we now run profclock() at hz (profhz == hz) rather than at
the slower stathz.
- On Alpha, for the TurboLaser machines that don't have an 8254
timecounter, call hardclock() directly. This removes an extra
conditional check from every clock interrupt on Alpha on the BSP.
There is probably room for even further pruning here by changing Alpha
to use the simplified timecounter we use on x86 with the lapic timer
since we don't get interrupts from the 8254 on Alpha anyway.
- On x86, clkintr() shouldn't ever be called now unless using_lapic_timer
is false, so add a KASSERT() to that affect and remove a condition
to slightly optimize the non-lapic case.
- Change prototypeof arm_handler_execute() so that it's first arg is a
trapframe pointer rather than a void pointer for clarity.
- Use KCOUNT macro in profclock() to lookup the kernel profiling bucket.
Tested on: alpha, amd64, arm, i386, ia64, sparc64
Reviewed by: bde (mostly)
Diffstat (limited to 'sys/powerpc/include')
-rw-r--r-- | sys/powerpc/include/clock.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/cpu.h | 5 | ||||
-rw-r--r-- | sys/powerpc/include/frame.h | 7 |
3 files changed, 1 insertions, 13 deletions
diff --git a/sys/powerpc/include/clock.h b/sys/powerpc/include/clock.h index fb45259..a0918c9 100644 --- a/sys/powerpc/include/clock.h +++ b/sys/powerpc/include/clock.h @@ -19,7 +19,7 @@ int sysbeep(int pitch, int period); int acquire_timer2(int mode); int release_timer2(void); -void decr_intr(struct clockframe *); +void decr_intr(struct trapframe *); #endif diff --git a/sys/powerpc/include/cpu.h b/sys/powerpc/include/cpu.h index 73a882b..913c910 100644 --- a/sys/powerpc/include/cpu.h +++ b/sys/powerpc/include/cpu.h @@ -39,11 +39,6 @@ #include <machine/pcb.h> #include <machine/psl.h> -#define CLKF_USERMODE(frame) (((frame)->srr1 & PSL_PR) != 0) -#define CLKF_BASEPRI(frame) ((frame)->pri == 0) -#define CLKF_PC(frame) ((frame)->srr0) -#define CLKF_INTR(frame) ((frame)->depth > 0) - #define TRAPF_USERMODE(frame) (((frame)->srr1 & PSL_PR) != 0) #define TRAPF_PC(frame) ((frame)->srr0) diff --git a/sys/powerpc/include/frame.h b/sys/powerpc/include/frame.h index 096ed67..09b7a95 100644 --- a/sys/powerpc/include/frame.h +++ b/sys/powerpc/include/frame.h @@ -65,13 +65,6 @@ struct trapframe { #define FRAMELEN roundup(sizeof(struct trapframe) + 8, 16) #define trapframe(td) ((td)->td_frame) -struct clockframe { - register_t srr1; - register_t srr0; - int pri; - int depth; -}; - /* * Call frame for PowerPC used during fork. */ |