Deleted Added
full compact
cpu.h (69728) cpu.h (70861)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
37 * $FreeBSD: head/sys/i386/include/cpu.h 69728 2000-12-07 22:30:11Z phk $
37 * $FreeBSD: head/sys/i386/include/cpu.h 70861 2001-01-10 04:43:51Z jake $
38 */
39
40#ifndef _MACHINE_CPU_H_
41#define _MACHINE_CPU_H_
42
43/*
44 * Definitions unique to i386 cpu support.
45 */

--- 11 unchanged lines hidden (view full) ---

57#define cpu_exec(p) /* nothing */
58#define cpu_swapin(p) /* nothing */
59#define cpu_getstack(p) ((p)->p_md.md_regs->tf_esp)
60#define cpu_setstack(p, ap) ((p)->p_md.md_regs->tf_esp = (ap))
61
62#define CLKF_USERMODE(framep) \
63 ((ISPL((framep)->cf_cs) == SEL_UPL) || (framep->cf_eflags & PSL_VM))
64
38 */
39
40#ifndef _MACHINE_CPU_H_
41#define _MACHINE_CPU_H_
42
43/*
44 * Definitions unique to i386 cpu support.
45 */

--- 11 unchanged lines hidden (view full) ---

57#define cpu_exec(p) /* nothing */
58#define cpu_swapin(p) /* nothing */
59#define cpu_getstack(p) ((p)->p_md.md_regs->tf_esp)
60#define cpu_setstack(p, ap) ((p)->p_md.md_regs->tf_esp = (ap))
61
62#define CLKF_USERMODE(framep) \
63 ((ISPL((framep)->cf_cs) == SEL_UPL) || (framep->cf_eflags & PSL_VM))
64
65#define CLKF_INTR(framep) (intr_nesting_level >= 2)
65#define CLKF_INTR(framep) (PCPU_GET(intr_nesting_level) >= 2)
66#define CLKF_PC(framep) ((framep)->cf_eip)
67
68/*
69 * astpending bits
70 */
71#define AST_PENDING 0x00000001
72#define AST_RESCHED 0x00000002
73
74/*
75 * Preempt the current process if in interrupt from user mode,
76 * or after the current trap/syscall if in system mode.
77 *
78 * XXX: if astpending is later changed to an |= here due to more flags being
79 * added, we will have an atomicy problem. The type of atomicy we need is
80 * a non-locked orl.
81 */
82#define need_resched() do { \
83 PCPU_SET(astpending, AST_RESCHED|AST_PENDING); \
84} while (0)
66#define CLKF_PC(framep) ((framep)->cf_eip)
67
68/*
69 * astpending bits
70 */
71#define AST_PENDING 0x00000001
72#define AST_RESCHED 0x00000002
73
74/*
75 * Preempt the current process if in interrupt from user mode,
76 * or after the current trap/syscall if in system mode.
77 *
78 * XXX: if astpending is later changed to an |= here due to more flags being
79 * added, we will have an atomicy problem. The type of atomicy we need is
80 * a non-locked orl.
81 */
82#define need_resched() do { \
83 PCPU_SET(astpending, AST_RESCHED|AST_PENDING); \
84} while (0)
85#define resched_wanted() (astpending & AST_RESCHED)
85#define resched_wanted() (PCPU_GET(astpending) & AST_RESCHED)
86
87/*
88 * Arrange to handle pending profiling ticks before returning to user mode.
89 *
90 * XXX this is now poorly named and implemented. It used to handle only a
91 * single tick and the P_OWEUPC flag served as a counter. Now there is a
92 * counter in the proc table and flag isn't really necessary.
93 */

--- 6 unchanged lines hidden (view full) ---

100 *
101 * XXX: aston() really needs to be an atomic (not locked, but an orl),
102 * in case need_resched() is set by an interrupt. But with astpending a
103 * per-cpu variable this is not trivial to do efficiently. For now we blow
104 * it off (asynchronous need_resched() conflicts are not critical).
105 */
106#define signotify(p) aston()
107#define aston() do { \
86
87/*
88 * Arrange to handle pending profiling ticks before returning to user mode.
89 *
90 * XXX this is now poorly named and implemented. It used to handle only a
91 * single tick and the P_OWEUPC flag served as a counter. Now there is a
92 * counter in the proc table and flag isn't really necessary.
93 */

--- 6 unchanged lines hidden (view full) ---

100 *
101 * XXX: aston() really needs to be an atomic (not locked, but an orl),
102 * in case need_resched() is set by an interrupt. But with astpending a
103 * per-cpu variable this is not trivial to do efficiently. For now we blow
104 * it off (asynchronous need_resched() conflicts are not critical).
105 */
106#define signotify(p) aston()
107#define aston() do { \
108 PCPU_SET(astpending, astpending | AST_PENDING); \
108 PCPU_SET(astpending, PCPU_GET(astpending) | AST_PENDING); \
109} while (0)
110#define astoff()
111
112/*
113 * CTL_MACHDEP definitions.
114 */
115#define CPU_CONSDEV 1 /* dev_t: console terminal device */
116#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */

--- 46 unchanged lines hidden ---
109} while (0)
110#define astoff()
111
112/*
113 * CTL_MACHDEP definitions.
114 */
115#define CPU_CONSDEV 1 /* dev_t: console terminal device */
116#define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */

--- 46 unchanged lines hidden ---