1c1
< /* $FreeBSD: head/sys/ia64/include/cpu.h 107206 2002-11-24 20:15:08Z marcel $ */
---
> /* $FreeBSD: head/sys/ia64/include/cpu.h 115084 2003-05-16 21:26:42Z marcel $ */
49,52d48
< /*
< * Exported definitions unique to Alpha cpu support.
< */
<
55,56d50
< #define cpu_getstack(td) ((td)->td_frame->tf_r[FRAME_SP])
<
58,60c52,53
< * Arguments to hardclock and gatherstats encapsulate the previous
< * machine state in an opaque clockframe. One the Alpha, we use
< * what we push on an interrupt (a trapframe).
---
> * Arguments to hardclock and gatherstats encapsulate the previous machine
> * state in an opaque clockframe.
63c56
< struct trapframe cf_tf;
---
> struct trapframe cf_tf;
65,67c58,59
< #define TRAPF_USERMODE(framep) \
< (((framep)->tf_cr_ipsr & IA64_PSR_CPL) == IA64_PSR_CPL_USER)
< #define TRAPF_PC(framep) ((framep)->tf_cr_iip)
---
> #define CLKF_PC(cf) ((cf)->cf_tf.tf_special.iip)
> #define CLKF_USERMODE(cf) ((CLKF_PC(cf) >> 61) < 5)
69,70c61,62
< #define CLKF_USERMODE(framep) TRAPF_USERMODE(&(framep)->cf_tf)
< #define CLKF_PC(framep) TRAPF_PC(&(framep)->cf_tf)
---
> /* Used by signaling code. */
> #define cpu_getstack(td) ((td)->td_frame->tf_special.sp)
71a64,68
> /* XXX */
> #define TRAPF_PC(tf) ((tf)->tf_special.iip)
> #define TRAPF_USERMODE(framep) \
> (((framep)->tf_special.psr & IA64_PSR_CPL) == IA64_PSR_CPL_USER)
>
110c107
< int badaddr (void *, size_t);
---
> int badaddr(void *, size_t);
113c110
< void do_sir(void);
---
> int do_ast(struct trapframe *);
115d111
< void exception_restore(void); /* MAGIC */
118c114,116
< int ia64_pa_access(u_long);
---
> int ia64_highfp_drop(struct thread *);
> int ia64_highfp_load(struct thread *);
> int ia64_highfp_save(struct thread *);
120,123c118
< void ia64_fpstate_check(struct thread *p);
< void ia64_fpstate_save(struct thread *p, int write);
< void ia64_fpstate_drop(struct thread *p);
< void ia64_fpstate_switch(struct thread *p);
---
> int ia64_pa_access(u_long);
126,127c121,122
< void machine_check
< (unsigned long, struct trapframe *, unsigned long, unsigned long);
---
> void machine_check(unsigned long, struct trapframe *, unsigned long,
> unsigned long);
134,135c129,130
< void syscall(int, u_int64_t *, struct trapframe *);
< void trap(int vector, int imm, struct trapframe *framep);
---
> int syscall(struct trapframe *);
> void trap(int vector, struct trapframe *framep);
137a133
> void map_gateway_page(void);