summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/alpha/include/cpu.h4
-rw-r--r--sys/arch/amiga/include/cpu.h3
-rw-r--r--sys/arch/hp300/include/cpu.h3
-rw-r--r--sys/arch/hppa/include/cpu.h3
-rw-r--r--sys/arch/i386/include/cpu.h3
-rw-r--r--sys/arch/mac68k/include/cpu.h3
-rw-r--r--sys/arch/mvme68k/include/cpu.h3
-rw-r--r--sys/arch/mvme88k/include/cpu.h3
-rw-r--r--sys/arch/powerpc/include/cpu.h3
-rw-r--r--sys/arch/sparc/include/cpu.h3
-rw-r--r--sys/arch/sparc64/include/cpu.h3
-rw-r--r--sys/arch/sun3/include/cpu.h3
-rw-r--r--sys/arch/vax/include/psl.h3
13 files changed, 13 insertions, 27 deletions
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index 1f66e81d7cc..0d60953366b 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.17 2002/05/26 07:55:01 matthieu Exp $ */
+/* $OpenBSD: cpu.h,v 1.18 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
/*-
@@ -260,8 +260,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) \
(((framep)->cf_tf.tf_regs[FRAME_PS] & ALPHA_PSL_USERMODE) != 0)
-#define CLKF_BASEPRI(framep) \
- (((framep)->cf_tf.tf_regs[FRAME_PS] & ALPHA_PSL_IPL_MASK) == 0)
#define CLKF_PC(framep) ((framep)->cf_tf.tf_regs[FRAME_PC])
/*
diff --git a/sys/arch/amiga/include/cpu.h b/sys/arch/amiga/include/cpu.h
index 6683ebdf766..820cf03a99e 100644
--- a/sys/arch/amiga/include/cpu.h
+++ b/sys/arch/amiga/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.20 2002/03/25 19:41:03 niklas Exp $ */
+/* $OpenBSD: cpu.h,v 1.21 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.36 1996/09/11 00:11:42 thorpej Exp $ */
/*
@@ -76,7 +76,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->sr & PSL_IPL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#if 0
/* We would like to do it this way... */
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index 90732e80c0d..9c664b5cf7c 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.19 2002/03/14 01:26:31 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.20 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $ */
/*
@@ -80,7 +80,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->sr & PSL_IPL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#if 0
/* We would like to do it this way... */
diff --git a/sys/arch/hppa/include/cpu.h b/sys/arch/hppa/include/cpu.h
index 46b0f66abd5..8ae13f87b10 100644
--- a/sys/arch/hppa/include/cpu.h
+++ b/sys/arch/hppa/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.29 2002/03/15 21:44:18 mickey Exp $ */
+/* $OpenBSD: cpu.h,v 1.30 2002/06/07 21:33:43 nordin Exp $ */
/*
* Copyright (c) 2000-2001 Michael Shalayeff
@@ -104,7 +104,6 @@ extern const char *cpu_typename;
#define HPPA_NMODSPBUS 64
#define clockframe trapframe
-#define CLKF_BASEPRI(framep) ((framep)->tf_eiem == ~0U)
#define CLKF_PC(framep) ((framep)->tf_iioq_head)
#define CLKF_INTR(framep) ((framep)->tf_flags & TFF_INTR)
#define CLKF_USERMODE(framep) ((framep)->tf_flags & T_USER)
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index aa413239594..7c73020e71f 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.41 2002/03/14 01:26:33 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.42 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */
/*-
@@ -65,7 +65,6 @@
#define clockframe intrframe
#define CLKF_USERMODE(frame) USERMODE((frame)->if_cs, (frame)->if_eflags)
-#define CLKF_BASEPRI(frame) ((frame)->if_ppl == 0)
#define CLKF_PC(frame) ((frame)->if_eip)
#define CLKF_INTR(frame) (IDXSEL((frame)->if_cs) == GICODE_SEL)
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index a884cc13c27..8203c42bc60 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.26 2002/04/27 01:52:10 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.27 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */
/*
@@ -102,7 +102,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->sr & PSL_IPL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#define CLKF_INTR(framep) (0) /* XXX should use PSL_M (see hp300) */
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 2ff957d0f1a..547bd505423 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.13 2002/04/28 14:47:53 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.14 2002/06/07 21:33:43 nordin Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -122,7 +122,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->sr & PSL_IPL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#if 0
/* We would like to do it this way... */
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index 11481c03263..0996b338d50 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.18 2002/03/14 01:26:39 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.19 2002/06/07 21:33:43 nordin Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1992, 1993
@@ -84,7 +84,6 @@ struct clockframe {
extern int intstack;
#define CLKF_USERMODE(framep) ((((struct trapframe *)(framep))->epsr & PSR_MODE) == 0)
-#define CLKF_BASEPRI(framep) (((struct trapframe *)(framep))->mask == 0)
#define CLKF_PC(framep) (((struct trapframe *)(framep))->sxip & ~3)
#define CLKF_INTR(framep) (((struct trapframe *)(framep))->r[31] > intstack)
diff --git a/sys/arch/powerpc/include/cpu.h b/sys/arch/powerpc/include/cpu.h
index 41ffd0693bc..5fddfb0fc62 100644
--- a/sys/arch/powerpc/include/cpu.h
+++ b/sys/arch/powerpc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.9 2002/03/14 01:26:41 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.10 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.1 1996/09/30 16:34:21 ws Exp $ */
/*
@@ -39,7 +39,6 @@
#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)
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index 97778d3740e..b46edfb1170 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.14 2002/04/30 01:12:28 art Exp $ */
+/* $OpenBSD: cpu.h,v 1.15 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
/*
@@ -95,7 +95,6 @@ typedef struct clockframe clockframe;
extern int eintstack[];
#define CLKF_USERMODE(framep) (((framep)->psr & PSR_PS) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->psr & PSR_PIL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#define CLKF_INTR(framep) ((framep)->fp < (u_int)eintstack)
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 05847ed1de6..b29f112e679 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.10 2002/03/27 15:12:22 jason Exp $ */
+/* $OpenBSD: cpu.h,v 1.11 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -173,7 +173,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->t.tf_tstate & TSTATE_PRIV) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->t.tf_oldpil) == 0)
#define CLKF_PC(framep) ((framep)->t.tf_pc)
#define CLKF_INTR(framep) ((!CLKF_USERMODE(framep))&&\
(((framep)->t.tf_kstack < (vaddr_t)EINTSTACK)&&\
diff --git a/sys/arch/sun3/include/cpu.h b/sys/arch/sun3/include/cpu.h
index c4b85a7a936..6f125d536da 100644
--- a/sys/arch/sun3/include/cpu.h
+++ b/sys/arch/sun3/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.15 2002/03/14 01:26:46 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.16 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: cpu.h,v 1.20 1995/12/21 05:02:10 mycroft Exp $ */
/*
@@ -78,7 +78,6 @@ struct clockframe {
};
#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_BASEPRI(framep) (((framep)->sr & PSL_IPL) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#if 0
/* We would like to do it this way... */
diff --git a/sys/arch/vax/include/psl.h b/sys/arch/vax/include/psl.h
index 958bf1c9e44..e9bb68bbb7a 100644
--- a/sys/arch/vax/include/psl.h
+++ b/sys/arch/vax/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.5 2000/04/26 03:08:42 bjc Exp $ */
+/* $OpenBSD: psl.h,v 1.6 2002/06/07 21:33:43 nordin Exp $ */
/* $NetBSD: psl.h,v 1.6 1997/06/07 12:15:28 ragge Exp $ */
/*
@@ -105,7 +105,6 @@
* Macros to decode processor status word.
*/
#define CLKF_USERMODE(framep) ((((framep)->ps) & (PSL_U)) == PSL_U)
-#define CLKF_BASEPRI(framep) ((((framep)->ps) & (PSL_IPL1F)) == 0)
#define CLKF_PC(framep) ((framep)->pc)
#define CLKF_INTR(framep) ((((framep)->ps) & (PSL_IS)) == PSL_IS)
#define PSL2IPL(ps) ((ps) >> 16)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 00:01:08 +0000