diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-02-10 20:05:41 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2000-02-10 20:05:41 +0000 |
| commit | fd3d613ca298fd4c08e3dbb44e7a29abd73b85d6 (patch) | |
| tree | 1fa3eacd725c4f7a66271c9eb304f62a831c043d /sys/arch | |
| parent | 84555989aecf9596fa64cd6419267e4cdb3cf200 (diff) | |
clkf_intr() implementation, better clkf_usermode()
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/hppa/include/cpu.h | 8 | ||||
| -rw-r--r-- | sys/arch/hppa/include/trap.h | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h index 31ddceb1154..1531c7af19f 100644 --- a/sys/arch/hppa/include/cpu.h +++ b/sys/arch/hppa/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.12 2000/01/25 12:52:51 mickey Exp $ */ +/* $OpenBSD: cpu.h,v 1.13 2000/02/10 20:05:40 mickey Exp $ */ /* * Copyright (c) 1988-1994, The University of Utah and @@ -26,6 +26,7 @@ #ifndef _MACHINE_CPU_H_ #define _MACHINE_CPU_H_ +#include <machine/trap.h> #include <machine/frame.h> /* @@ -52,8 +53,9 @@ #define clockframe trapframe #define CLKF_BASEPRI(framep) ((framep)->tf_eiem == ~0U) #define CLKF_PC(framep) ((framep)->tf_iioq_head) -#define CLKF_INTR(framep) (0) /* XXX */ -#define CLKF_USERMODE(framep) (USERMODE((framep)->tf_iioq_head)) +#define CLKF_INTR(framep) ((framep)->tf_flags & TFF_INTR) +#define CLKF_USERMODE(framep) ((framep)->tf_flags & T_USER) +#define CLKF_SYSCALL(framep) ((framep)->tf_flags & TFF_SYS) #define signotify(p) (void)(p) #define need_resched() {(void)1;} diff --git a/sys/arch/hppa/include/trap.h b/sys/arch/hppa/include/trap.h index 811f40c2972..06bd1527c51 100644 --- a/sys/arch/hppa/include/trap.h +++ b/sys/arch/hppa/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.7 2000/01/17 00:02:12 mickey Exp $ */ +/* $OpenBSD: trap.h,v 1.8 2000/02/10 20:05:39 mickey Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -79,15 +79,17 @@ #define TFF_LAST_POS 0 #define TFF_ITLB_POS 1 #define TFF_SYS_POS 2 +#define TFF_INTR_POS 3 #define TFF_LAST (1 << (31 - TFF_LAST_POS)) #define TFF_ITLB (1 << (31 - TFF_ITLB_POS)) #define TFF_SYS (1 << (31 - TFF_SYS_POS)) +#define TFF_INTR (1 << (31 - TFF_INTR_POS)) /* - * Definre this for pretty printings of trapflags. + * Define this for pretty printings of trapflags. */ -#define T_BITS "\020\07user\037itlb\040last" +#define T_BITS "\020\07user\036intr\037itlb\040last" /* * These are break instruction entry points. |