diff --git a/sys/arch/arm/arm32/fault.c b/sys/arch/arm/arm32/fault.c index 29035e3f9c91..84c81a1be466 100644 --- a/sys/arch/arm/arm32/fault.c +++ b/sys/arch/arm/arm32/fault.c @@ -1,4 +1,4 @@ -/* $NetBSD: fault.c,v 1.14 2002/03/25 01:53:36 thorpej Exp $ */ +/* $NetBSD: fault.c,v 1.15 2002/03/25 16:32:55 thorpej Exp $ */ /* * Copyright (c) 1994-1997 Mark Brinicombe. @@ -68,7 +68,6 @@ #include int cowfault __P((vaddr_t)); -int fetchuserword __P((u_int address, u_int *location)); extern char fusubailout[]; static void report_abort __P((const char *, u_int, u_int, u_int)); diff --git a/sys/arch/arm/arm32/fusu.S b/sys/arch/arm/arm32/fusu.S index 8f889168c8c8..f4b339e2df8f 100644 --- a/sys/arch/arm/arm32/fusu.S +++ b/sys/arch/arm/arm32/fusu.S @@ -1,4 +1,4 @@ -/* $NetBSD: fusu.S,v 1.2 2002/03/02 15:35:05 chris Exp $ */ +/* $NetBSD: fusu.S,v 1.3 2002/03/25 16:32:55 thorpej Exp $ */ /* * Copyright (c) 1996-1998 Mark Brinicombe. @@ -35,48 +35,6 @@ #include "assym.h" #include -/* - * Reads a word but traps failed faults - * - * This is similar to fuword() but rather than returnin - * the word, the second argument points to the location - * to store the word in. The function returns 0 for - * suceess and -1 for failure. - * This routine is used to fetch a word from user space - * when the value being fetched could be -1. By separating - * error flagging from the return value this is achieved. - * This function is used by the prefetch abort handler - * - * r0 - address to read - * r1 - address to store result - */ - -ENTRY(fetchuserword) - ldr r2, Lvm_min_address - cmp r0, r2 - bcc fusuaddrfault - ldr r2, Lvm_maxuser_address - cmp r0, r2 - bcs fusuaddrfault - - ldr r2, Lcurpcb - ldr r2, [r2] - -#ifdef DIAGNOSTIC - teq r2, #0x00000000 - beq fusupcbfault -#endif - - add r3, pc, #fusufault - . - 8 - str r3, [r2, #PCB_ONFAULT] - - ldr r0, [r0] - str r0, [r1] - - mov r0, #0x00000000 - str r0, [r2, #PCB_ONFAULT] - mov pc, lr - Lcurpcb: .word _C_LABEL(curpcb) @@ -85,7 +43,6 @@ Lvm_min_address: Lvm_maxuser_address: .word VM_MAXUSER_ADDRESS - /* * fuword(caddr_t uaddr); * Fetch an int from the user's address space.