diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2007-05-20 14:34:24 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2007-05-20 14:34:24 +0000 |
| commit | b1890ca22d874fb370ac187b53434f3eca727304 (patch) | |
| tree | c9053be94dd4bfed8ddccee78fdb674b9228a1bb | |
| parent | 33e9691e2dc0401176de186b7e72b4e3d6851129 (diff) | |
Remove unused badaddr().
| -rw-r--r-- | sys/arch/mips64/include/trap.h | 10 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/lcore_access.S | 37 | ||||
| -rw-r--r-- | sys/arch/sgi/include/autoconf.h | 3 |
3 files changed, 6 insertions, 44 deletions
diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h index e190be4415f..2fd793bd754 100644 --- a/sys/arch/mips64/include/trap.h +++ b/sys/arch/mips64/include/trap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.h,v 1.7 2006/06/06 17:42:28 miod Exp $ */ +/* $OpenBSD: trap.h,v 1.8 2007/05/20 14:34:21 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -74,11 +74,9 @@ /* * Defines for trap handler catching kernel accessng memory. */ -#define KT_BADERR 1 /* Bad address */ -#define KT_COPYERR 2 /* User space copy error */ -#define KT_KCOPYERR 3 /* Kernel space copy error */ -#define KT_DDBERR 4 /* DDB access error */ - +#define KT_COPYERR 1 /* User space copy error */ +#define KT_KCOPYERR 2 /* Kernel space copy error */ +#define KT_DDBERR 3 /* DDB access error */ #ifndef _LOCORE diff --git a/sys/arch/mips64/mips64/lcore_access.S b/sys/arch/mips64/mips64/lcore_access.S index 15567a41511..ca52a6053cf 100644 --- a/sys/arch/mips64/mips64/lcore_access.S +++ b/sys/arch/mips64/mips64/lcore_access.S @@ -1,4 +1,4 @@ -/* $OpenBSD: lcore_access.S,v 1.9 2005/12/20 07:06:26 miod Exp $ */ +/* $OpenBSD: lcore_access.S,v 1.10 2007/05/20 14:34:23 miod Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -57,7 +57,6 @@ .align 3 onfault_table: PTR_VAL 0 # invalid index number - PTR_VAL baderr PTR_VAL _copyerr PTR_VAL _copyerr #if defined(DDB) || defined(DEBUG) @@ -68,40 +67,6 @@ onfault_table: .text /* - * See if access to addr with a len type instruction causes a machine check. - * len is length of access (1=byte, 2=short, 4=long) - * - * badaddr(addr, len) - * char *addr; - * int len; - */ -LEAF(badaddr, 0) - li v0, KT_BADERR - PTR_L t3, curprocpaddr - bne a1, 1, 2f - sw v0, PCB_ONFAULT(t3) - lbu v0, (a0) # don't put in bd-slot! - b 5f - nop -2: - bne a1, 2, 4f - nop - lhu v0, (a0) # don't put in bd-slot! - b 5f - nop -4: - lw v0, (a0) -5: - sync - sw zero, PCB_ONFAULT(t3) - j ra - move v0, zero # made it w/o errors -baderr: - j ra - li v0, 1 # trap sends us here -END(badaddr) - -/* * This code is copied the user's stack for returning from signal handlers * (see sendsig() and sigreturn()). We have to compute the address * of the sigcontext struct for the sigreturn call. diff --git a/sys/arch/sgi/include/autoconf.h b/sys/arch/sgi/include/autoconf.h index c2e71a19f83..ac4a7610fd6 100644 --- a/sys/arch/sgi/include/autoconf.h +++ b/sys/arch/sgi/include/autoconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.h,v 1.10 2005/02/22 20:32:39 grange Exp $ */ +/* $OpenBSD: autoconf.h,v 1.11 2007/05/20 14:34:23 miod Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -135,7 +135,6 @@ struct confargs { bus_addr_t ca_baseaddr; }; -int badaddr(void *, u_int64_t); void enaddr_aton(const char *, u_int8_t *); #endif /* _MACHINE_AUTOCONF_H_ */ |