details: https://anonhg.NetBSD.org/src/rev/456b32d34838
branches: trunk
changeset: 789742:456b32d34838
user: skrll <skrll%NetBSD.org@localhost>
date: Fri Sep 06 09:43:32 2013 +0000
description:
Improve the #ifdefs
"it's not worse." from matt@
diffstat:
sys/arch/arm/arm/vectors.S | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diffs (52 lines):
diff -r 33c0bcb6b4b0 -r 456b32d34838 sys/arch/arm/arm/vectors.S
--- a/sys/arch/arm/arm/vectors.S Fri Sep 06 05:50:22 2013 +0000
+++ b/sys/arch/arm/arm/vectors.S Fri Sep 06 09:43:32 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vectors.S,v 1.8 2013/08/18 06:29:29 matt Exp $ */
+/* $NetBSD: vectors.S,v 1.9 2013/09/06 09:43:32 skrll Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -66,13 +66,14 @@
b irq_entry
#ifdef __ARM_FIQ_INDIRECT
b _C_LABEL(fiqvector)
-#elif !defined(ARM_HAS_VBAR)
- b .Lfiqvector
+#else
+_C_LABEL(fiqvector):
+ subs pc, lr, #4
#endif
END(page0rel)
-#endif /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
-#ifndef ARM_HAS_VBAR
+#else /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
+
.global _C_LABEL(page0), _C_LABEL(page0_data), _C_LABEL(page0_end)
.align 0
_C_LABEL(page0):
@@ -85,21 +86,14 @@
ldr pc, .Lirq_target
#ifdef __ARM_FIQ_INDIRECT
ldr pc, .Lfiq_target
-#endif
-END(page0)
-#endif /* !ARM_HAS_VBAR */
-#ifndef __ARM_FIQ_INDIRECT
+#else
.Lfiqvector:
-#ifdef ARM_HAS_VBAR
- .set _C_LABEL(fiqvector), . - _C_LABEL(page0rel)
-#else
.set _C_LABEL(fiqvector), . - _C_LABEL(page0)
-#endif
subs pc, lr, #4
.org .Lfiqvector + 0x100
+END(page0)
#endif
-#ifndef ARM_HAS_VBAR
_C_LABEL(page0_data):
.Lreset_target:
.word reset_entry