diff options
author | Brandon Creighton <bjc@cvs.openbsd.org> | 2000-04-26 03:08:44 +0000 |
---|---|---|
committer | Brandon Creighton <bjc@cvs.openbsd.org> | 2000-04-26 03:08:44 +0000 |
commit | 45a8a1573c086203341f94a21561004a4cee6da7 (patch) | |
tree | 2123e70519f5f81d6c224cab62a3447af95422c2 /sys/arch/vax/include/trap.h | |
parent | 510a16a02bcefe3e18aa4ea1df737f2cdff509e6 (diff) |
vax resurrection, part 1: sync with early-april netbsd
many changes here, notable: uvm, ansi.h, more (and cleaner) vsbus support
Diffstat (limited to 'sys/arch/vax/include/trap.h')
-rw-r--r-- | sys/arch/vax/include/trap.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h index 860ea3fd6fb..5b19bbb71e3 100644 --- a/sys/arch/vax/include/trap.h +++ b/sys/arch/vax/include/trap.h @@ -1,5 +1,5 @@ -/* $OpenBSD: trap.h,v 1.9 1997/09/12 09:21:25 maja Exp $ */ -/* $NetBSD: trap.h,v 1.16 1997/07/28 21:48:36 ragge Exp $ */ +/* $OpenBSD: trap.h,v 1.10 2000/04/26 03:08:43 bjc Exp $ */ +/* $NetBSD: trap.h,v 1.17 2000/01/24 02:40:32 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -100,20 +100,18 @@ struct trapframe { */ struct ivec_dsp { char pushr; /* pushr */ - char pushrarg; /* $3f */ - char pushl; /* pushl */ - char pushlarg; /* $? */ - char nop; /* nop, for foolish gcc */ - char calls[3]; /* calls $1,? */ - void (*hoppaddr) __P((int)); /* jump for calls */ - char popr; /* popr $0x3f */ - char poprarg; - char rei; /* rei */ - char pad; /* sizeof(struct ivec_dsp) == 16 */ + char pushrarg; /* $0x3f */ + char jsb; + char mode; + long displacement; + void (*hoppaddr) __P((void *)); + void *pushlarg; }; -extern struct ivec_dsp idsptch; +#ifdef _KERNEL +extern const struct ivec_dsp idsptch; +#endif #endif /* _LOCORE */ -#endif _VAX_TRAP_H_ +#endif /* _VAX_TRAP_H_ */ |