Module Name: src
Committed By: matt
Date: Mon Mar 24 18:45:16 UTC 2014
Modified Files:
src/sys/arch/arm/arm32 [matt-nb5-mips64]: exception.S
Log Message:
Use the improved undefined method from HEAD
To generate a diff of this commit:
cvs rdiff -u -r1.16.18.1 -r1.16.18.2 src/sys/arch/arm/arm32/exception.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/exception.S
diff -u src/sys/arch/arm/arm32/exception.S:1.16.18.1 src/sys/arch/arm/arm32/exception.S:1.16.18.2
--- src/sys/arch/arm/arm32/exception.S:1.16.18.1 Sat Feb 15 16:18:36 2014
+++ src/sys/arch/arm/arm32/exception.S Mon Mar 24 18:45:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exception.S,v 1.16.18.1 2014/02/15 16:18:36 matt Exp $ */
+/* $NetBSD: exception.S,v 1.16.18.2 2014/03/24 18:45:16 matt Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -51,7 +51,7 @@
#include <arm/locore.h>
- RCSID("$NetBSD: exception.S,v 1.16.18.1 2014/02/15 16:18:36 matt Exp $")
+ RCSID("$NetBSD: exception.S,v 1.16.18.2 2014/03/24 18:45:16 matt Exp $")
.text
.align 0
@@ -218,13 +218,11 @@ ASEND(address_exception_entry)
* look like direct entry from the vector.
*/
ASENTRY_NP(undefined_entry)
- stmfd sp!, {r0, r1}
+ str r0, [sp, #-8]!
GET_CURCPU(r0)
- ldr r1, [sp], #0x0004
- str r1, [r0, #CI_UNDEFSAVE]!
- ldr r1, [sp], #0x0004
- str r1, [r0, #0x0004]
- ldmia r0, {r0, r1, pc}
+ ldr r0, [r0, #CI_UNDEFSAVE+8]
+ str r0, [sp, #4]
+ pop {r0, pc}
ASEND(undefined_entry)
/*
