To unify our archs and to expose this structure in MI code without
having another layer of abstraction, I'd like to rename it.
ok?
Index: loongson/dev/bonito.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/dev/bonito.c,v
retrieving revision 1.30
diff -u -p -r1.30 bonito.c
--- loongson/dev/bonito.c 19 Sep 2015 21:07:04 -0000 1.30
+++ loongson/dev/bonito.c 6 Mar 2016 13:51:07 -0000
@@ -95,9 +95,9 @@ bus_addr_t bonito_pa_to_device(paddr_t);
paddr_t bonito_device_to_pa(bus_addr_t);
void bonito_intr_makemasks(void);
-uint32_t bonito_intr_2e(uint32_t, struct trap_frame *);
-uint32_t bonito_intr_2f(uint32_t, struct trap_frame *);
-void bonito_intr_dispatch(uint64_t, int, struct trap_frame *);
+uint32_t bonito_intr_2e(uint32_t, struct trapframe *);
+uint32_t bonito_intr_2f(uint32_t, struct trapframe *);
+void bonito_intr_dispatch(uint64_t, int, struct trapframe *);
void bonito_attach_hook(struct device *, struct device *,
struct pcibus_attach_args *);
@@ -573,7 +573,7 @@ bonito_intr_makemasks()
*/
uint32_t
-bonito_intr_2e(uint32_t hwpend, struct trap_frame *frame)
+bonito_intr_2e(uint32_t hwpend, struct trapframe *frame)
{
uint64_t imr, isr, mask;
@@ -630,7 +630,7 @@ bonito_intr_2e(uint32_t hwpend, struct t
}
uint32_t
-bonito_intr_2f(uint32_t hwpend, struct trap_frame *frame)
+bonito_intr_2f(uint32_t hwpend, struct trapframe *frame)
{
uint64_t imr, isr, mask;
@@ -677,7 +677,7 @@ bonito_intr_2f(uint32_t hwpend, struct t
}
void
-bonito_intr_dispatch(uint64_t isr, int startbit, struct trap_frame *frame)
+bonito_intr_dispatch(uint64_t isr, int startbit, struct trapframe *frame)
{
int lvl, bitno;
uint64_t tmpisr, mask;
Index: loongson/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/loongson/include/intr.h,v
retrieving revision 1.7
diff -u -p -r1.7 intr.h
--- loongson/include/intr.h 13 Sep 2015 20:38:45 -0000 1.7
+++ loongson/include/intr.h 6 Mar 2016 13:51:07 -0000
@@ -180,8 +180,8 @@ void intr_barrier(void *);
extern uint32_t idle_mask;
-struct trap_frame;
-void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trap_frame *));
+struct trapframe;
+void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trapframe *));
uint32_t updateimask(uint32_t);
void dosoftint(void);
Index: loongson/loongson/generic2e_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/loongson/generic2e_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 generic2e_machdep.c
--- loongson/loongson/generic2e_machdep.c 27 Mar 2014 22:16:03 -0000
1.6
+++ loongson/loongson/generic2e_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -92,7 +92,7 @@ void *generic2e_isa_intr_establish(void
void *, char *);
void generic2e_isa_intr_disestablish(void *, void *);
-uint32_t generic2e_isa_intr(uint32_t, struct trap_frame *);
+uint32_t generic2e_isa_intr(uint32_t, struct trapframe *);
void via686sb_setup(pci_chipset_tag_t, int);
@@ -236,7 +236,7 @@ generic2e_isa_intr_disestablish(void *v,
}
uint32_t
-generic2e_isa_intr(uint32_t hwpend, struct trap_frame *frame)
+generic2e_isa_intr(uint32_t hwpend, struct trapframe *frame)
{
struct intrhand *ih;
uint64_t isr, mask = 0;
Index: loongson/loongson/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/loongson/machdep.c,v
retrieving revision 1.63
diff -u -p -r1.63 machdep.c
--- loongson/loongson/machdep.c 7 May 2015 01:55:43 -0000 1.63
+++ loongson/loongson/machdep.c 6 Mar 2016 13:51:07 -0000
@@ -685,7 +685,7 @@ mips_init(uint64_t argc, uint64_t argv,
proc0.p_addr = proc0paddr = curcpu()->ci_curprocpaddr =
(struct user *)pmap_steal_memory(USPACE, NULL, NULL);
- proc0.p_md.md_regs = (struct trap_frame *)&proc0paddr->u_pcb.pcb_regs;
+ proc0.p_md.md_regs = (struct trapframe *)&proc0paddr->u_pcb.pcb_regs;
tlb_set_pid(MIN_USER_ASID);
/*
Index: loongson/loongson/yeeloong_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/loongson/loongson/yeeloong_machdep.c,v
retrieving revision 1.24
diff -u -p -r1.24 yeeloong_machdep.c
--- loongson/loongson/yeeloong_machdep.c 27 Mar 2014 22:16:03 -0000
1.24
+++ loongson/loongson/yeeloong_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -78,7 +78,7 @@ void lemote_isa_intr_disestablish(void
uint lemote_get_isa_imr(void);
uint lemote_get_isa_isr(void);
-uint32_t lemote_isa_intr(uint32_t, struct trap_frame *);
+uint32_t lemote_isa_intr(uint32_t, struct trapframe *);
extern void (*cpu_setperf)(int);
const struct bonito_config lemote_bonito = {
@@ -339,7 +339,7 @@ lemote_isa_intr_disestablish(void *v, vo
* XXX if they ever are triggered...
*/
uint32_t
-lemote_isa_intr(uint32_t hwpend, struct trap_frame *frame)
+lemote_isa_intr(uint32_t hwpend, struct trapframe *frame)
{
uint64_t imr, isr, mask;
int bit;
Index: mips64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/cpu.h,v
retrieving revision 1.109
diff -u -p -r1.109 cpu.h
--- mips64/include/cpu.h 1 Mar 2016 19:17:37 -0000 1.109
+++ mips64/include/cpu.h 6 Mar 2016 13:51:07 -0000
@@ -281,7 +281,7 @@ void cp0_calibrate(struct cpu_info *);
* Arguments to hardclock encapsulate the previous machine state in
* an opaque clockframe.
*/
-#define clockframe trap_frame /* Use normal trap frame */
+#define clockframe trapframe /* Use normal trap frame */
#define SR_KSU_USER 0x00000010
#define CLKF_USERMODE(framep) ((framep)->sr & SR_KSU_USER)
@@ -431,20 +431,20 @@ void savectx(struct user *, int);
void enable_fpu(struct proc *);
void save_fpu(void);
-int fpe_branch_emulate(struct proc *, struct trap_frame *, uint32_t,
+int fpe_branch_emulate(struct proc *, struct trapframe *, uint32_t,
vaddr_t);
void MipsSaveCurFPState(struct proc *);
void MipsSaveCurFPState16(struct proc *);
-void MipsSwitchFPState(struct proc *, struct trap_frame *);
-void MipsSwitchFPState16(struct proc *, struct trap_frame *);
+void MipsSwitchFPState(struct proc *, struct trapframe *);
+void MipsSwitchFPState16(struct proc *, struct trapframe *);
int guarded_read_1(paddr_t, uint8_t *);
int guarded_read_2(paddr_t, uint16_t *);
int guarded_read_4(paddr_t, uint32_t *);
int guarded_write_4(paddr_t, uint32_t);
-void MipsFPTrap(struct trap_frame *);
-register_t MipsEmulateBranch(struct trap_frame *, vaddr_t, uint32_t, uint32_t);
+void MipsFPTrap(struct trapframe *);
+register_t MipsEmulateBranch(struct trapframe *, vaddr_t, uint32_t, uint32_t);
int classify_insn(uint32_t);
#define INSNCLASS_NEUTRAL 0
@@ -458,9 +458,9 @@ int classify_insn(uint32_t);
extern int r4000_errata;
u_int eop_page_check(paddr_t);
void eop_tlb_flush_addr(struct pmap *, vaddr_t, u_long);
-int eop_tlb_miss_handler(struct trap_frame *, struct cpu_info *,
+int eop_tlb_miss_handler(struct trapframe *, struct cpu_info *,
struct proc *);
-void eop_cleanup(struct trap_frame *, struct proc *);
+void eop_cleanup(struct trapframe *, struct proc *);
/*
* Low level access routines to CPU registers
Index: mips64/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/db_machdep.h,v
retrieving revision 1.15
diff -u -p -r1.15 db_machdep.h
--- mips64/include/db_machdep.h 21 Mar 2014 23:05:41 -0000 1.15
+++ mips64/include/db_machdep.h 6 Mar 2016 13:51:07 -0000
@@ -35,7 +35,7 @@
#define DB_MACHINE_COMMANDS /* We have machine specific commands */
-typedef struct trap_frame db_regs_t;
+typedef struct trapframe db_regs_t;
extern db_regs_t ddb_regs;
typedef long db_expr_t;
Index: mips64/include/frame.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/frame.h,v
retrieving revision 1.6
diff -u -p -r1.6 frame.h
--- mips64/include/frame.h 9 Jul 2014 12:58:08 -0000 1.6
+++ mips64/include/frame.h 6 Mar 2016 13:51:07 -0000
@@ -32,7 +32,7 @@
* The layout of this *must* match with regnum.h or bad things
* will happen. libc setjmp/longjmp depends on this as well.
*/
-struct trap_frame {
+struct trapframe {
register_t zero;
register_t ast;
register_t v0;
Index: mips64/include/pcb.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/pcb.h,v
retrieving revision 1.7
diff -u -p -r1.7 pcb.h
--- mips64/include/pcb.h 5 May 2015 02:13:47 -0000 1.7
+++ mips64/include/pcb.h 6 Mar 2016 13:51:07 -0000
@@ -46,7 +46,7 @@
* MIPS process control block. This is first in the U-area.
*/
struct pcb {
- struct trap_frame pcb_regs; /* saved CPU and registers */
+ struct trapframe pcb_regs; /* saved CPU and registers */
struct {
register_t val[13];
} pcb_context; /* kernel context for resume */
Index: mips64/include/proc.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/proc.h,v
retrieving revision 1.8
diff -u -p -r1.8 proc.h
--- mips64/include/proc.h 23 Mar 2011 16:54:36 -0000 1.8
+++ mips64/include/proc.h 6 Mar 2016 13:51:07 -0000
@@ -41,7 +41,7 @@
* Machine-dependent part of the proc structure.
*/
struct mdproc {
- struct trap_frame *md_regs; /* registers on current frame */
+ struct trapframe *md_regs; /* registers on current frame */
volatile int md_astpending; /* AST pending for this process */
int md_flags; /* machine-dependent flags */
vaddr_t md_uarea; /* allocated uarea virtual addr */
Index: mips64/include/rm7000.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/rm7000.h,v
retrieving revision 1.3
diff -u -p -r1.3 rm7000.h
--- mips64/include/rm7000.h 1 Mar 2010 22:41:09 -0000 1.3
+++ mips64/include/rm7000.h 6 Mar 2016 13:51:07 -0000
@@ -88,8 +88,8 @@
#ifdef _KERNEL
__BEGIN_DECLS
int rm7k_perfcntr(int, long, long, long);
-void rm7k_perfintr(struct trap_frame *);
-int rm7k_watchintr(struct trap_frame *);
+void rm7k_perfintr(struct trapframe *);
+int rm7k_watchintr(struct trapframe *);
void cp0_setperfcount(int);
void cp0_setperfctrl(int);
int cp0_getperfcount(void);
Index: mips64/mips64/clock.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/clock.c,v
retrieving revision 1.40
diff -u -p -r1.40 clock.c
--- mips64/mips64/clock.c 1 May 2015 11:17:22 -0000 1.40
+++ mips64/mips64/clock.c 6 Mar 2016 13:51:07 -0000
@@ -61,7 +61,7 @@ struct cfattach clock_ca = {
};
void cp0_startclock(struct cpu_info *);
-uint32_t cp0_int5(uint32_t, struct trap_frame *);
+uint32_t cp0_int5(uint32_t, struct trapframe *);
int
clockmatch(struct device *parent, void *vcf, void *aux)
@@ -100,7 +100,7 @@ clockattach(struct device *parent, struc
* the clock is logically unmasked again.
*/
uint32_t
-cp0_int5(uint32_t mask, struct trap_frame *tf)
+cp0_int5(uint32_t mask, struct trapframe *tf)
{
u_int32_t clkdiff;
struct cpu_info *ci = curcpu();
Index: mips64/mips64/db_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/db_machdep.c,v
retrieving revision 1.44
diff -u -p -r1.44 db_machdep.c
--- mips64/mips64/db_machdep.c 27 Feb 2016 13:08:07 -0000 1.44
+++ mips64/mips64/db_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -62,7 +62,7 @@ void kdbpoke(vaddr_t, uint32_t);
void kdbpoked(vaddr_t, uint64_t);
void kdbpokew(vaddr_t, uint16_t);
void kdbpokeb(vaddr_t, uint8_t);
-int db_ktrap(int, struct trap_frame *);
+int db_ktrap(int, struct trapframe *);
void db_print_tlb(uint, uint64_t);
void db_trap_trace_cmd(db_expr_t, int, db_expr_t, char *);
@@ -130,7 +130,7 @@ struct db_variable *db_eregs = db_regs +
extern label_t *db_recover;
int
-db_ktrap(int type, struct trap_frame *fp)
+db_ktrap(int type, struct trapframe *fp)
{
switch(type) {
case T_BREAK: /* breakpoint */
@@ -336,7 +336,7 @@ void
db_stack_trace_print(db_expr_t addr, boolean_t have_addr, db_expr_t count,
char *modif, int (*pr)(const char *, ...))
{
- struct trap_frame *regs = &ddb_regs;
+ struct trapframe *regs = &ddb_regs;
if (have_addr) {
(*pr)("mips trace requires a trap frame... giving up\n");
Index: mips64/mips64/interrupt.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/interrupt.c,v
retrieving revision 1.65
diff -u -p -r1.65 interrupt.c
--- mips64/mips64/interrupt.c 13 Sep 2015 20:38:45 -0000 1.65
+++ mips64/mips64/interrupt.c 6 Mar 2016 13:51:07 -0000
@@ -48,7 +48,7 @@
#endif
void dummy_splx(int);
-void interrupt(struct trap_frame *);
+void interrupt(struct trapframe *);
static struct evcount soft_count;
static int soft_irq = 0;
@@ -58,7 +58,7 @@ int last_low_int;
struct {
uint32_t int_mask;
- uint32_t (*int_hand)(uint32_t, struct trap_frame *);
+ uint32_t (*int_hand)(uint32_t, struct trapframe *);
} cpu_int_tab[NLOWINT];
int_f *splx_hand = &dummy_splx;
@@ -98,7 +98,7 @@ int_f *splx_hand = &dummy_splx;
*/
void
-interrupt(struct trap_frame *trapframe)
+interrupt(struct trapframe *trapframe)
{
struct cpu_info *ci = curcpu();
u_int32_t pending;
@@ -164,7 +164,7 @@ interrupt(struct trap_frame *trapframe)
*/
void
set_intr(int pri, uint32_t mask,
- uint32_t (*int_hand)(uint32_t, struct trap_frame *))
+ uint32_t (*int_hand)(uint32_t, struct trapframe *))
{
if ((idle_mask & SOFT_INT_MASK) == 0) {
evcount_attach(&soft_count, "soft", &soft_irq);
Index: mips64/mips64/fp_emulate.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/fp_emulate.c,v
retrieving revision 1.13
diff -u -p -r1.13 fp_emulate.c
--- mips64/mips64/fp_emulate.c 10 Sep 2015 14:37:20 -0000 1.13
+++ mips64/mips64/fp_emulate.c 6 Mar 2016 13:51:07 -0000
@@ -44,30 +44,30 @@
#include <machine/db_machdep.h>
#endif
-int fpu_emulate(struct proc *, struct trap_frame *, uint32_t,
+int fpu_emulate(struct proc *, struct trapframe *, uint32_t,
union sigval *);
-int fpu_emulate_cop1(struct proc *, struct trap_frame *, uint32_t);
-int fpu_emulate_cop1x(struct proc *, struct trap_frame *, uint32_t);
+int fpu_emulate_cop1(struct proc *, struct trapframe *, uint32_t);
+int fpu_emulate_cop1x(struct proc *, struct trapframe *, uint32_t);
uint64_t
- fpu_load(struct proc *, struct trap_frame *, uint, uint);
-void fpu_store(struct proc *, struct trap_frame *, uint, uint, uint64_t);
+ fpu_load(struct proc *, struct trapframe *, uint, uint);
+void fpu_store(struct proc *, struct trapframe *, uint, uint, uint64_t);
#ifdef FPUEMUL
-int nofpu_emulate_cop1(struct proc *, struct trap_frame *, uint32_t,
+int nofpu_emulate_cop1(struct proc *, struct trapframe *, uint32_t,
union sigval *);
-int nofpu_emulate_cop1x(struct proc *, struct trap_frame *, uint32_t,
+int nofpu_emulate_cop1x(struct proc *, struct trapframe *, uint32_t,
union sigval *);
-int nofpu_emulate_loadstore(struct proc *, struct trap_frame *, uint32_t,
+int nofpu_emulate_loadstore(struct proc *, struct trapframe *, uint32_t,
union sigval *);
-int nofpu_emulate_movci(struct trap_frame *, uint32_t);
+int nofpu_emulate_movci(struct trapframe *, uint32_t);
#endif
-typedef int (fpu_fn3)(struct proc *, struct trap_frame *, uint, uint,
uint,
+typedef int (fpu_fn3)(struct proc *, struct trapframe *, uint, uint,
uint,
uint);
-typedef int (fpu_fn4)(struct proc *, struct trap_frame *, uint, uint,
uint,
+typedef int (fpu_fn4)(struct proc *, struct trapframe *, uint, uint,
uint,
uint, uint);
fpu_fn3 fpu_abs;
fpu_fn3 fpu_add;
-int fpu_c(struct proc *, struct trap_frame *, uint, uint, uint, uint, uint);
+int fpu_c(struct proc *, struct trapframe *, uint, uint, uint, uint, uint);
fpu_fn3 fpu_ceil_l;
fpu_fn3 fpu_ceil_w;
fpu_fn3 fpu_cvt_d;
@@ -77,9 +77,9 @@ fpu_fn3 fpu_cvt_w;
fpu_fn3 fpu_div;
fpu_fn3 fpu_floor_l;
fpu_fn3 fpu_floor_w;
-int fpu_int_l(struct proc *, struct trap_frame *, uint, uint, uint, uint,
+int fpu_int_l(struct proc *, struct trapframe *, uint, uint, uint, uint,
uint);
-int fpu_int_w(struct proc *, struct trap_frame *, uint, uint, uint, uint,
+int fpu_int_w(struct proc *, struct trapframe *, uint, uint, uint, uint,
uint);
fpu_fn4 fpu_madd;
fpu_fn4 fpu_msub;
@@ -127,7 +127,7 @@ fpu_fn3 fpu_trunc_w;
* Handle a floating-point exception.
*/
void
-MipsFPTrap(struct trap_frame *tf)
+MipsFPTrap(struct trapframe *tf)
{
struct cpu_info *ci = curcpu();
struct proc *p = ci->ci_curproc;
@@ -410,7 +410,7 @@ deliver:
* current PCB, and is pointed to by the trap frame.
*/
int
-fpu_emulate(struct proc *p, struct trap_frame *tf, uint32_t insn,
+fpu_emulate(struct proc *p, struct trapframe *tf, uint32_t insn,
union sigval *sv)
{
InstFmt inst;
@@ -480,7 +480,7 @@ fpu_emulate(struct proc *p, struct trap_
* Emulate a COP1 FPU instruction.
*/
int
-fpu_emulate_cop1(struct proc *p, struct trap_frame *tf, uint32_t insn)
+fpu_emulate_cop1(struct proc *p, struct trapframe *tf, uint32_t insn)
{
InstFmt inst;
uint ft, fs, fd;
@@ -612,7 +612,7 @@ fpu_emulate_cop1(struct proc *p, struct
* Emulate a COP1X FPU instruction.
*/
int
-fpu_emulate_cop1x(struct proc *p, struct trap_frame *tf, uint32_t insn)
+fpu_emulate_cop1x(struct proc *p, struct trapframe *tf, uint32_t insn)
{
InstFmt inst;
uint fr, ft, fs, fd;
@@ -678,7 +678,7 @@ fpu_emulate_cop1x(struct proc *p, struct
* Load a floating-point argument according to the specified format.
*/
uint64_t
-fpu_load(struct proc *p, struct trap_frame *tf, uint fmt, uint regno)
+fpu_load(struct proc *p, struct trapframe *tf, uint fmt, uint regno)
{
uint64_t tmp, tmp2;
@@ -716,7 +716,7 @@ fpu_load(struct proc *p, struct trap_fra
* Store a floating-point result according to the specified format.
*/
void
-fpu_store(struct proc *p, struct trap_frame *tf, uint fmt, uint regno,
+fpu_store(struct proc *p, struct trapframe *tf, uint fmt, uint regno,
uint64_t rslt)
{
if (tf->sr & SR_FR_32) {
@@ -735,7 +735,7 @@ fpu_store(struct proc *p, struct trap_fr
*/
int
-fpu_int_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_int_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd, uint rm)
{
uint64_t raw;
@@ -765,7 +765,7 @@ fpu_int_l(struct proc *p, struct trap_fr
}
int
-fpu_int_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_int_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd, uint rm)
{
uint64_t raw;
@@ -799,7 +799,7 @@ fpu_int_w(struct proc *p, struct trap_fr
*/
int
-fpu_abs(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_abs(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -834,7 +834,7 @@ fpu_abs(struct proc *p, struct trap_fram
}
int
-fpu_add(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_add(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw1, raw2, rslt;
@@ -857,7 +857,7 @@ fpu_add(struct proc *p, struct trap_fram
}
int
-fpu_c(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_c(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd, uint op)
{
uint64_t raw1, raw2;
@@ -932,7 +932,7 @@ skip:
}
int
-fpu_ceil_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_ceil_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards positive infinity */
@@ -940,7 +940,7 @@ fpu_ceil_l(struct proc *p, struct trap_f
}
int
-fpu_ceil_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_ceil_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards positive infinity */
@@ -948,7 +948,7 @@ fpu_ceil_w(struct proc *p, struct trap_f
}
int
-fpu_cvt_d(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_cvt_d(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -976,7 +976,7 @@ fpu_cvt_d(struct proc *p, struct trap_fr
}
int
-fpu_cvt_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_cvt_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1007,7 +1007,7 @@ fpu_cvt_l(struct proc *p, struct trap_fr
}
int
-fpu_cvt_s(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_cvt_s(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1035,7 +1035,7 @@ fpu_cvt_s(struct proc *p, struct trap_fr
}
int
-fpu_cvt_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_cvt_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1066,7 +1066,7 @@ fpu_cvt_w(struct proc *p, struct trap_fr
}
int
-fpu_div(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_div(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw1, raw2, rslt;
@@ -1089,7 +1089,7 @@ fpu_div(struct proc *p, struct trap_fram
}
int
-fpu_floor_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_floor_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards negative infinity */
@@ -1097,7 +1097,7 @@ fpu_floor_l(struct proc *p, struct trap_
}
int
-fpu_floor_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_floor_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards negative infinity */
@@ -1105,7 +1105,7 @@ fpu_floor_w(struct proc *p, struct trap_
}
int
-fpu_madd(struct proc *p, struct trap_frame *tf, uint fmt, uint fr, uint ft,
+fpu_madd(struct proc *p, struct trapframe *tf, uint fmt, uint fr, uint ft,
uint fs, uint fd)
{
uint64_t raw1, raw2, raw3, rslt;
@@ -1133,7 +1133,7 @@ fpu_madd(struct proc *p, struct trap_fra
}
int
-fpu_mov(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_mov(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1150,7 +1150,7 @@ fpu_mov(struct proc *p, struct trap_fram
}
int
-fpu_movcf(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_movcf(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1174,7 +1174,7 @@ fpu_movcf(struct proc *p, struct trap_fr
}
int
-fpu_movn(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_movn(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
register_t *regs = (register_t *)tf;
@@ -1192,7 +1192,7 @@ fpu_movn(struct proc *p, struct trap_fra
}
int
-fpu_movz(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_movz(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
register_t *regs = (register_t *)tf;
@@ -1210,7 +1210,7 @@ fpu_movz(struct proc *p, struct trap_fra
}
int
-fpu_msub(struct proc *p, struct trap_frame *tf, uint fmt, uint fr, uint ft,
+fpu_msub(struct proc *p, struct trapframe *tf, uint fmt, uint fr, uint ft,
uint fs, uint fd)
{
uint64_t raw1, raw2, raw3, rslt;
@@ -1238,7 +1238,7 @@ fpu_msub(struct proc *p, struct trap_fra
}
int
-fpu_mul(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_mul(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw1, raw2, rslt;
@@ -1261,7 +1261,7 @@ fpu_mul(struct proc *p, struct trap_fram
}
int
-fpu_neg(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_neg(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1296,7 +1296,7 @@ fpu_neg(struct proc *p, struct trap_fram
}
int
-fpu_nmadd(struct proc *p, struct trap_frame *tf, uint fmt, uint fr, uint ft,
+fpu_nmadd(struct proc *p, struct trapframe *tf, uint fmt, uint fr, uint ft,
uint fs, uint fd)
{
uint64_t raw1, raw2, raw3, rslt;
@@ -1332,7 +1332,7 @@ fpu_nmadd(struct proc *p, struct trap_fr
}
int
-fpu_nmsub(struct proc *p, struct trap_frame *tf, uint fmt, uint fr, uint ft,
+fpu_nmsub(struct proc *p, struct trapframe *tf, uint fmt, uint fr, uint ft,
uint fs, uint fd)
{
uint64_t raw1, raw2, raw3, rslt;
@@ -1368,7 +1368,7 @@ fpu_nmsub(struct proc *p, struct trap_fr
}
int
-fpu_recip(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_recip(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1392,7 +1392,7 @@ fpu_recip(struct proc *p, struct trap_fr
}
int
-fpu_round_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_round_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards nearest */
@@ -1400,7 +1400,7 @@ fpu_round_l(struct proc *p, struct trap_
}
int
-fpu_round_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_round_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards nearest */
@@ -1408,7 +1408,7 @@ fpu_round_w(struct proc *p, struct trap_
}
int
-fpu_rsqrt(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_rsqrt(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1438,7 +1438,7 @@ fpu_rsqrt(struct proc *p, struct trap_fr
}
int
-fpu_sqrt(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_sqrt(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw;
@@ -1462,7 +1462,7 @@ fpu_sqrt(struct proc *p, struct trap_fra
}
int
-fpu_sub(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_sub(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
uint64_t raw1, raw2, rslt;
@@ -1485,7 +1485,7 @@ fpu_sub(struct proc *p, struct trap_fram
}
int
-fpu_trunc_l(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_trunc_l(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards zero */
@@ -1493,7 +1493,7 @@ fpu_trunc_l(struct proc *p, struct trap_
}
int
-fpu_trunc_w(struct proc *p, struct trap_frame *tf, uint fmt, uint ft, uint fs,
+fpu_trunc_w(struct proc *p, struct trapframe *tf, uint fmt, uint ft, uint fs,
uint fd)
{
/* round towards zero */
@@ -1506,7 +1506,7 @@ fpu_trunc_w(struct proc *p, struct trap_
* Emulate a COP1 non-FPU instruction.
*/
int
-nofpu_emulate_cop1(struct proc *p, struct trap_frame *tf, uint32_t insn,
+nofpu_emulate_cop1(struct proc *p, struct trapframe *tf, uint32_t insn,
union sigval *sv)
{
register_t *regs = (register_t *)tf;
@@ -1636,7 +1636,7 @@ nofpu_emulate_cop1(struct proc *p, struc
* Emulate a COP1X non-FPU instruction.
*/
int
-nofpu_emulate_cop1x(struct proc *p, struct trap_frame *tf, uint32_t insn,
+nofpu_emulate_cop1x(struct proc *p, struct trapframe *tf, uint32_t insn,
union sigval *sv)
{
register_t *regs = (register_t *)tf;
@@ -1725,7 +1725,7 @@ nofpu_emulate_cop1x(struct proc *p, stru
* Emulate a load/store instruction on FPU registers.
*/
int
-nofpu_emulate_loadstore(struct proc *p, struct trap_frame *tf, uint32_t insn,
+nofpu_emulate_loadstore(struct proc *p, struct trapframe *tf, uint32_t insn,
union sigval *sv)
{
register_t *regs = (register_t *)tf;
@@ -1799,7 +1799,7 @@ nofpu_emulate_loadstore(struct proc *p,
* Emulate MOVF and MOVT.
*/
int
-nofpu_emulate_movci(struct trap_frame *tf, uint32_t insn)
+nofpu_emulate_movci(struct trapframe *tf, uint32_t insn)
{
register_t *regs = (register_t *)tf;
InstFmt inst;
Index: mips64/mips64/mips64_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/mips64_machdep.c,v
retrieving revision 1.19
diff -u -p -r1.19 mips64_machdep.c
--- mips64/mips64/mips64_machdep.c 15 Dec 2014 02:24:22 -0000 1.19
+++ mips64/mips64/mips64_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -148,7 +148,7 @@ setregs(p, pack, stack, retval)
{
struct cpu_info *ci = curcpu();
- bzero((caddr_t)p->p_md.md_regs, sizeof(struct trap_frame));
+ bzero((caddr_t)p->p_md.md_regs, sizeof(struct trapframe));
p->p_md.md_regs->sp = stack;
p->p_md.md_regs->pc = pack->ep_entry & ~3;
p->p_md.md_regs->t9 = pack->ep_entry & ~3; /* abicall req */
Index: mips64/mips64/process_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/process_machdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 process_machdep.c
--- mips64/mips64/process_machdep.c 24 Nov 2010 21:01:03 -0000 1.16
+++ mips64/mips64/process_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -76,7 +76,7 @@
#include <machine/frame.h>
#include <machine/reg.h>
-#define REGSIZE (sizeof(struct trap_frame) - sizeof(register_t))
+#define REGSIZE (sizeof(struct trapframe) - sizeof(register_t))
int
process_read_regs(p, regs)
Index: mips64/mips64/r4000_errata.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/r4000_errata.c,v
retrieving revision 1.5
diff -u -p -r1.5 r4000_errata.c
--- mips64/mips64/r4000_errata.c 16 Nov 2014 12:30:58 -0000 1.5
+++ mips64/mips64/r4000_errata.c 6 Mar 2016 13:51:07 -0000
@@ -147,7 +147,7 @@ eop_tlb_flush_addr(struct pmap *pmap, va
* further processing in the trap handler is necessary.
*/
int
-eop_tlb_miss_handler(struct trap_frame *trapframe, struct cpu_info *ci,
+eop_tlb_miss_handler(struct trapframe *trapframe, struct cpu_info *ci,
struct proc *p)
{
struct pcb *pcb;
@@ -266,7 +266,7 @@ eop_tlb_miss_handler(struct trap_frame *
* current pc is no longer in an errata vulnerable page.
*/
void
-eop_cleanup(struct trap_frame *trapframe, struct proc *p)
+eop_cleanup(struct trapframe *trapframe, struct proc *p)
{
struct pcb *pcb;
Index: mips64/mips64/sendsig.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/sendsig.c,v
retrieving revision 1.24
diff -u -p -r1.24 sendsig.c
--- mips64/mips64/sendsig.c 9 Feb 2015 08:48:23 -0000 1.24
+++ mips64/mips64/sendsig.c 6 Mar 2016 13:51:07 -0000
@@ -110,7 +110,7 @@ sendsig(catcher, sig, mask, code, type,
struct cpu_info *ci = curcpu();
struct proc *p = curproc;
struct sigframe *fp;
- struct trap_frame *regs;
+ struct trapframe *regs;
struct sigacts *psp = p->p_p->ps_sigacts;
int fsize;
struct sigcontext ksc;
@@ -216,7 +216,7 @@ sys_sigreturn(p, v, retval)
syscallarg(struct sigcontext *) sigcntxp;
} */ *uap = v;
struct sigcontext *scp;
- struct trap_frame *regs;
+ struct trapframe *regs;
struct sigcontext ksc;
int error;
Index: mips64/mips64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/trap.c,v
retrieving revision 1.115
diff -u -p -r1.115 trap.c
--- mips64/mips64/trap.c 1 Mar 2016 11:56:00 -0000 1.115
+++ mips64/mips64/trap.c 6 Mar 2016 13:51:07 -0000
@@ -121,7 +121,7 @@ const char *trap_type[] = {
struct trapdebug trapdebug[MAXCPUS * TRAPSIZE];
uint trppos[MAXCPUS];
-void stacktrace(struct trap_frame *);
+void stacktrace(struct trapframe *);
uint32_t kdbpeek(vaddr_t);
uint64_t kdbpeekd(vaddr_t);
#endif /* DDB || DEBUG */
@@ -131,9 +131,9 @@ extern int db_ktrap(int, db_regs_t *);
#endif
void ast(void);
-extern void interrupt(struct trap_frame *);
-void itsa(struct trap_frame *, struct cpu_info *, struct proc *, int);
-void trap(struct trap_frame *);
+extern void interrupt(struct trapframe *);
+void itsa(struct trapframe *, struct cpu_info *, struct proc *, int);
+void trap(struct trapframe *);
#ifdef PTRACE
int ptrace_read_insn(struct proc *, vaddr_t, uint32_t *);
int ptrace_write_insn(struct proc *, vaddr_t, uint32_t);
@@ -162,7 +162,7 @@ ast(void)
* pcb_onfault is set, otherwise, return old pc.
*/
void
-trap(struct trap_frame *trapframe)
+trap(struct trapframe *trapframe)
{
struct cpu_info *ci = curcpu();
struct proc *p = ci->ci_curproc;
@@ -265,7 +265,7 @@ trap(struct trap_frame *trapframe)
* Handle a single exception.
*/
void
-itsa(struct trap_frame *trapframe, struct cpu_info *ci, struct proc *p,
+itsa(struct trapframe *trapframe, struct cpu_info *ci, struct proc *p,
int type)
{
int i;
@@ -430,7 +430,7 @@ fault_common_no_miss:
case T_SYSCALL+T_USER:
{
- struct trap_frame *locr0 = p->p_md.md_regs;
+ struct trapframe *locr0 = p->p_md.md_regs;
struct sysent *callp;
unsigned int code;
register_t tpc;
@@ -549,7 +549,7 @@ fault_common_no_miss:
{
caddr_t va;
u_int32_t instr;
- struct trap_frame *locr0 = p->p_md.md_regs;
+ struct trapframe *locr0 = p->p_md.md_regs;
/* compute address of break instruction */
va = (caddr_t)trapframe->pc;
@@ -662,7 +662,7 @@ fault_common_no_miss:
{
caddr_t va;
u_int32_t instr;
- struct trap_frame *locr0 = p->p_md.md_regs;
+ struct trapframe *locr0 = p->p_md.md_regs;
/* compute address of trap instruction */
va = (caddr_t)trapframe->pc;
@@ -816,7 +816,7 @@ void
child_return(void *arg)
{
struct proc *p = arg;
- struct trap_frame *trapframe;
+ struct trapframe *trapframe;
trapframe = p->p_md.md_regs;
trapframe->v0 = 0;
@@ -890,7 +890,7 @@ trapDump(const char *msg, int (*pr)(cons
* Return the resulting PC as if the branch was executed.
*/
register_t
-MipsEmulateBranch(struct trap_frame *tf, vaddr_t instPC, uint32_t fsr,
+MipsEmulateBranch(struct trapframe *tf, vaddr_t instPC, uint32_t fsr,
uint32_t curinst)
{
register_t *regsPtr = (register_t *)tf;
@@ -1050,7 +1050,7 @@ ptrace_write_insn(struct proc *p, vaddr_
int
process_sstep(struct proc *p, int sstep)
{
- struct trap_frame *locr0 = p->p_md.md_regs;
+ struct trapframe *locr0 = p->p_md.md_regs;
int rc;
uint32_t curinstr;
vaddr_t va;
@@ -1124,13 +1124,13 @@ process_sstep(struct proc *p, int sstep)
#if !defined(DDB)
const char *fn_name(vaddr_t);
#endif
-void stacktrace_subr(struct trap_frame *, int, int (*)(const char*, ...));
+void stacktrace_subr(struct trapframe *, int, int (*)(const char*, ...));
/*
* Print a stack backtrace.
*/
void
-stacktrace(struct trap_frame *regs)
+stacktrace(struct trapframe *regs)
{
stacktrace_subr(regs, 6, printf);
}
@@ -1146,7 +1146,7 @@ stacktrace(struct trap_frame *regs)
#endif
void
-stacktrace_subr(struct trap_frame *regs, int count,
+stacktrace_subr(struct trapframe *regs, int count,
int (*pr)(const char*, ...))
{
vaddr_t pc, sp, ra, va, subr;
@@ -1337,9 +1337,9 @@ loop:
else
(*pr)("(KERNEL INTERRUPT)\n");
sp = *(register_t *)sp;
- pc = ((struct trap_frame *)sp)->pc;
- ra = ((struct trap_frame *)sp)->ra;
- sp = ((struct trap_frame *)sp)->sp;
+ pc = ((struct trapframe *)sp)->pc;
+ ra = ((struct trapframe *)sp)->ra;
+ sp = ((struct trapframe *)sp)->sp;
goto loop;
}
@@ -1409,7 +1409,7 @@ fn_name(vaddr_t addr)
* destination.
*/
int
-fpe_branch_emulate(struct proc *p, struct trap_frame *tf, uint32_t insn,
+fpe_branch_emulate(struct proc *p, struct trapframe *tf, uint32_t insn,
vaddr_t dest)
{
struct vm_map *map = &p->p_vmspace->vm_map;
Index: mips64/mips64/vm_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/vm_machdep.c,v
retrieving revision 1.32
diff -u -p -r1.32 vm_machdep.c
--- mips64/mips64/vm_machdep.c 5 May 2015 02:13:47 -0000 1.32
+++ mips64/mips64/vm_machdep.c 6 Mar 2016 13:51:07 -0000
@@ -136,7 +136,7 @@ cpu_fork(p1, p2, stack, stacksize, func,
}
pcb->pcb_context.val[10] = (register_t)proc_trampoline;
pcb->pcb_context.val[8] = (register_t)pcb +
- USPACE - sizeof(struct trap_frame);
+ USPACE - sizeof(struct trapframe);
pcb->pcb_context.val[1] = (register_t)arg;
pcb->pcb_context.val[0] = (register_t)func;
}
Index: octeon/dev/octeon_intr.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/octeon_intr.c,v
retrieving revision 1.11
diff -u -p -r1.11 octeon_intr.c
--- octeon/dev/octeon_intr.c 26 Sep 2015 04:37:18 -0000 1.11
+++ octeon/dev/octeon_intr.c 6 Mar 2016 13:51:07 -0000
@@ -51,8 +51,8 @@ extern bus_space_handle_t iobus_h;
void octeon_intr_makemasks(void);
void octeon_splx(int);
-uint32_t octeon_iointr(uint32_t, struct trap_frame *);
-uint32_t octeon_aux(uint32_t, struct trap_frame *);
+uint32_t octeon_iointr(uint32_t, struct trapframe *);
+uint32_t octeon_aux(uint32_t, struct trapframe *);
int octeon_iointr_skip(struct intrhand *, uint64_t, uint64_t);
void octeon_setintrmask(int);
@@ -215,7 +215,7 @@ octeon_intr_makemasks()
* Interrupt dispatcher.
*/
uint32_t
-octeon_iointr(uint32_t hwpend, struct trap_frame *frame)
+octeon_iointr(uint32_t hwpend, struct trapframe *frame)
{
struct cpu_info *ci = curcpu();
int cpuid = cpu_number();
Index: octeon/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/octeon/include/intr.h,v
retrieving revision 1.6
diff -u -p -r1.6 intr.h
--- octeon/include/intr.h 26 Sep 2015 04:05:42 -0000 1.6
+++ octeon/include/intr.h 6 Mar 2016 13:51:07 -0000
@@ -189,8 +189,8 @@ void intr_barrier(void *);
extern uint32_t idle_mask;
-struct trap_frame;
-void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trap_frame *));
+struct trapframe;
+void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trapframe *));
uint32_t updateimask(uint32_t);
void dosoftint(void);
Index: octeon/octeon/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/octeon/machdep.c,v
retrieving revision 1.71
diff -u -p -r1.71 machdep.c
--- octeon/octeon/machdep.c 16 Jan 2016 11:15:37 -0000 1.71
+++ octeon/octeon/machdep.c 6 Mar 2016 13:51:07 -0000
@@ -131,7 +131,7 @@ static void process_bootargs(void);
static uint64_t get_ncpusfound(void);
#ifdef MULTIPROCESSOR
-uint32_t ipi_intr(uint32_t, struct trap_frame *);
+uint32_t ipi_intr(uint32_t, struct trapframe *);
#endif
extern void parse_uboot_root(void);
@@ -432,7 +432,7 @@ mips_init(__register_t a0, __register_t
proc0.p_addr = proc0paddr = curcpu()->ci_curprocpaddr =
(struct user *)pmap_steal_memory(USPACE, NULL, NULL);
- proc0.p_md.md_regs = (struct trap_frame *)&proc0paddr->u_pcb.pcb_regs;
+ proc0.p_md.md_regs = (struct trapframe *)&proc0paddr->u_pcb.pcb_regs;
tlb_set_pid(MIN_USER_ASID);
/*
@@ -837,7 +837,7 @@ hw_cpu_hatch(struct cpu_info *ci)
* IPI dispatcher.
*/
uint32_t
-ipi_intr(uint32_t hwpend, struct trap_frame *frame)
+ipi_intr(uint32_t hwpend, struct trapframe *frame)
{
u_long cpuid = cpu_number();
Index: sgi/include/intr.h
===================================================================
RCS file: /cvs/src/sys/arch/sgi/include/intr.h,v
retrieving revision 1.46
diff -u -p -r1.46 intr.h
--- sgi/include/intr.h 25 Dec 2015 09:22:00 -0000 1.46
+++ sgi/include/intr.h 6 Mar 2016 13:51:08 -0000
@@ -183,8 +183,8 @@ void intr_barrier(void *);
extern uint32_t idle_mask;
-struct trap_frame;
-void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trap_frame *));
+struct trapframe;
+void set_intr(int, uint32_t, uint32_t(*)(uint32_t, struct trapframe *));
uint32_t updateimask(uint32_t);
void dosoftint(void);
Index: sgi/localbus/imc.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/localbus/imc.c,v
retrieving revision 1.20
diff -u -p -r1.20 imc.c
--- sgi/localbus/imc.c 24 Sep 2015 18:37:50 -0000 1.20
+++ sgi/localbus/imc.c 6 Mar 2016 13:51:08 -0000
@@ -86,7 +86,7 @@ struct cfdriver imc_cd = {
NULL, "imc", DV_DULL
};
-uint32_t imc_bus_error(uint32_t, struct trap_frame *);
+uint32_t imc_bus_error(uint32_t, struct trapframe *);
int imc_watchdog_cb(void *, int);
void imc_space_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t,
@@ -735,7 +735,7 @@ imc_bus_reset()
}
uint32_t
-imc_bus_error(uint32_t hwpend, struct trap_frame *tf)
+imc_bus_error(uint32_t hwpend, struct trapframe *tf)
{
uint32_t cpustat, giostat;
paddr_t cpuaddr, gioaddr;
Index: sgi/localbus/int.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/localbus/int.c,v
retrieving revision 1.11
diff -u -p -r1.11 int.c
--- sgi/localbus/int.c 30 Sep 2014 06:51:58 -0000 1.11
+++ sgi/localbus/int.c 6 Mar 2016 13:51:08 -0000
@@ -75,7 +75,7 @@ paddr_t int2_get_base(void);
void int_8254_cal(void);
void int_8254_startclock(struct cpu_info *);
-uint32_t int_8254_intr0(uint32_t, struct trap_frame *);
+uint32_t int_8254_intr0(uint32_t, struct trapframe *);
/*
* INT2 Interrupt handling declarations: 16 local sources on 2 levels.
@@ -102,9 +102,9 @@ uint32_t int2_intem;
uint8_t int2_l0imask[NIPLS], int2_l1imask[NIPLS];
void int2_splx(int);
-uint32_t int2_l0intr(uint32_t, struct trap_frame *);
+uint32_t int2_l0intr(uint32_t, struct trapframe *);
void int2_l0makemasks(void);
-uint32_t int2_l1intr(uint32_t, struct trap_frame *);
+uint32_t int2_l1intr(uint32_t, struct trapframe *);
void int2_l1makemasks(void);
/*
@@ -513,7 +513,7 @@ int_8254_cal(void)
}
uint32_t
-int_8254_intr0(uint32_t hwpend, struct trap_frame *tf)
+int_8254_intr0(uint32_t hwpend, struct trapframe *tf)
{
struct cpu_info *ci = curcpu();
Index: sgi/localbus/macebus.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/localbus/macebus.c,v
retrieving revision 1.63
diff -u -p -r1.63 macebus.c
--- sgi/localbus/macebus.c 30 Sep 2014 06:51:58 -0000 1.63
+++ sgi/localbus/macebus.c 6 Mar 2016 13:51:08 -0000
@@ -57,8 +57,8 @@ int macebussubmatch(struct device *, vo
void macebus_intr_makemasks(void);
void macebus_splx(int);
-uint32_t macebus_iointr(uint32_t, struct trap_frame *);
-uint32_t macebus_aux(uint32_t, struct trap_frame *);
+uint32_t macebus_iointr(uint32_t, struct trapframe *);
+uint32_t macebus_aux(uint32_t, struct trapframe *);
int macebus_iointr_skip(struct intrhand *, uint64_t, uint64_t);
void crime_setintrmask(int);
@@ -633,7 +633,7 @@ macebus_iointr_skip(struct intrhand *ih,
* Macebus auxilary functions run each clock interrupt.
*/
uint32_t
-macebus_aux(uint32_t hwpend, struct trap_frame *cf)
+macebus_aux(uint32_t hwpend, struct trapframe *cf)
{
u_int64_t mask;
Index: sgi/localbus/tcc.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/localbus/tcc.c,v
retrieving revision 1.9
diff -u -p -r1.9 tcc.c
--- sgi/localbus/tcc.c 5 Jan 2016 05:27:54 -0000 1.9
+++ sgi/localbus/tcc.c 6 Mar 2016 13:51:08 -0000
@@ -50,7 +50,7 @@ struct cfdriver tcc_cd = {
NULL, "tcc", DV_DULL
};
-uint32_t tcc_bus_error(uint32_t, struct trap_frame *);
+uint32_t tcc_bus_error(uint32_t, struct trapframe *);
CACHE_PROTOS(tcc)
@@ -99,7 +99,7 @@ tcc_bus_reset()
}
uint32_t
-tcc_bus_error(uint32_t hwpend, struct trap_frame *tf)
+tcc_bus_error(uint32_t hwpend, struct trapframe *tf)
{
uint64_t intr, error, addr, errack;
unsigned int errtype;
Index: sgi/sgi/intr_template.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/intr_template.c,v
retrieving revision 1.16
diff -u -p -r1.16 intr_template.c
--- sgi/sgi/intr_template.c 25 Dec 2015 09:22:00 -0000 1.16
+++ sgi/sgi/intr_template.c 6 Mar 2016 13:51:08 -0000
@@ -97,7 +97,7 @@ MASK_FUNCTIONNAME()
* Interrupt dispatcher.
*/
uint32_t
-INTR_FUNCTIONNAME(uint32_t hwpend, struct trap_frame *frame)
+INTR_FUNCTIONNAME(uint32_t hwpend, struct trapframe *frame)
{
struct cpu_info *ci = curcpu();
uint64_t imr, isr, mask;
Index: sgi/sgi/ip27_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/ip27_machdep.c,v
retrieving revision 1.72
diff -u -p -r1.72 ip27_machdep.c
--- sgi/sgi/ip27_machdep.c 27 Feb 2016 13:08:07 -0000 1.72
+++ sgi/sgi/ip27_machdep.c 6 Mar 2016 13:51:08 -0000
@@ -81,8 +81,8 @@ int ip27_hub_intr_establish(int (*)(void
void ip27_hub_intr_disestablish(int);
void ip27_hub_intr_clear(int);
void ip27_hub_intr_set(int);
-uint32_t hubpi_intr0(uint32_t, struct trap_frame *);
-uint32_t hubpi_intr1(uint32_t, struct trap_frame *);
+uint32_t hubpi_intr0(uint32_t, struct trapframe *);
+uint32_t hubpi_intr1(uint32_t, struct trapframe *);
void ip27_hub_intr_makemasks0(void);
void ip27_hub_intr_makemasks1(void);
void ip27_hub_setintrmask(int);
@@ -1018,8 +1018,8 @@ ip27_nmi(void *arg)
{
vaddr_t regs_offs;
register_t *regs, epc;
- struct trap_frame nmi_frame;
- extern int db_ktrap(int, struct trap_frame *);
+ struct trapframe nmi_frame;
+ extern int db_ktrap(int, struct trapframe *);
/*
* Build a ddb frame from the registers saved in the NMI KREGS
Index: sgi/sgi/ip30_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/ip30_machdep.c,v
retrieving revision 1.64
diff -u -p -r1.64 ip30_machdep.c
--- sgi/sgi/ip30_machdep.c 27 Feb 2016 13:08:07 -0000 1.64
+++ sgi/sgi/ip30_machdep.c 6 Mar 2016 13:51:08 -0000
@@ -62,7 +62,7 @@ extern void xheart_setintrmask(int);
extern struct user *proc0paddr;
#endif
-uint32_t ip30_lights_frob(uint32_t, struct trap_frame *);
+uint32_t ip30_lights_frob(uint32_t, struct trapframe *);
paddr_t ip30_widget_short(int16_t, u_int);
paddr_t ip30_widget_long(int16_t, u_int);
paddr_t ip30_widget_map(int16_t, u_int, bus_addr_t *, bus_size_t *);
@@ -386,7 +386,7 @@ ip30_find_video()
* Fun with the lightbar
*/
uint32_t
-ip30_lights_frob(uint32_t hwpend, struct trap_frame *cf)
+ip30_lights_frob(uint32_t hwpend, struct trapframe *cf)
{
uint32_t gpioold, gpio;
@@ -436,12 +436,12 @@ ip30_get_ncpusfound(void)
void
ip30_nmi_handler()
{
- extern int db_ktrap(int, struct trap_frame *);
- extern void stacktrace(struct trap_frame *);
- struct trap_frame *fr0;
+ extern int db_ktrap(int, struct trapframe *);
+ extern void stacktrace(struct trapframe *);
+ struct trapframe *fr0;
int s;
#ifdef MULTIPROCESSOR
- struct trap_frame *fr1;
+ struct trapframe *fr1;
struct cpu_info *ci = curcpu();
#endif
@@ -458,10 +458,10 @@ ip30_nmi_handler()
printf("NMI\n");
- fr0 = (struct trap_frame *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x4000,
+ fr0 = (struct trapframe *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x4000,
CCA_CACHED);
#ifdef MULTIPROCESSOR
- fr1 = (struct trap_frame *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x6000,
+ fr1 = (struct trapframe *)PHYS_TO_XKPHYS(IP30_MEMORY_BASE + 0x6000,
CCA_CACHED);
#endif
Index: sgi/sgi/machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/machdep.c,v
retrieving revision 1.150
diff -u -p -r1.150 machdep.c
--- sgi/sgi/machdep.c 10 Dec 2014 15:29:53 -0000 1.150
+++ sgi/sgi/machdep.c 6 Mar 2016 13:51:08 -0000
@@ -587,7 +587,7 @@ mips_init(int argc, void *argv, caddr_t
proc0.p_cpu = ci;
proc0.p_addr = proc0paddr = ci->ci_curprocpaddr =
(struct user *)pmap_steal_memory(USPACE, NULL, NULL);
- proc0.p_md.md_regs = (struct trap_frame *)&proc0paddr->u_pcb.pcb_regs;
+ proc0.p_md.md_regs = (struct trapframe *)&proc0paddr->u_pcb.pcb_regs;
tlb_set_pid(MIN_USER_ASID);
/*
@@ -1066,7 +1066,7 @@ printf("perfcnt error %d\n", cmd);
*/
void
rm7k_perfintr(trapframe)
- struct trap_frame *trapframe;
+ struct trapframe *trapframe;
{
struct proc *p = curproc;
@@ -1081,7 +1081,7 @@ rm7k_perfintr(trapframe)
int
rm7k_watchintr(trapframe)
- struct trap_frame *trapframe;
+ struct trapframe *trapframe;
{
return(0);
}
Index: sgi/xbow/xheart.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/xbow/xheart.c,v
retrieving revision 1.29
diff -u -p -r1.29 xheart.c
--- sgi/xbow/xheart.c 26 Sep 2015 04:37:18 -0000 1.29
+++ sgi/xbow/xheart.c 6 Mar 2016 13:51:08 -0000
@@ -70,7 +70,7 @@ int xheart_intr_establish(int (*)(void *
void xheart_intr_disestablish(int);
void xheart_intr_clear(int);
void xheart_intr_set(int);
-uint32_t xheart_intr_handler(uint32_t, struct trap_frame *);
+uint32_t xheart_intr_handler(uint32_t, struct trapframe *);
void xheart_intr_makemasks(void);
void xheart_setintrmask(int);
void xheart_splx(int);
@@ -86,7 +86,7 @@ struct timecounter xheart_timecounter =
.tc_quality = 100
};
-extern uint32_t ip30_lights_frob(uint32_t, struct trap_frame *);
+extern uint32_t ip30_lights_frob(uint32_t, struct trapframe *);
/*
* HEART interrupt handling declarations: 64 sources; 5 levels.
