Module Name: src
Committed By: skrll
Date: Fri Sep 6 09:43:32 UTC 2013
Modified Files:
src/sys/arch/arm/arm: vectors.S
Log Message:
Improve the #ifdefs
"it's not worse." from matt@
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/vectors.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/arm/vectors.S
diff -u src/sys/arch/arm/arm/vectors.S:1.8 src/sys/arch/arm/arm/vectors.S:1.9
--- src/sys/arch/arm/arm/vectors.S:1.8 Sun Aug 18 06:29:29 2013
+++ src/sys/arch/arm/arm/vectors.S Fri Sep 6 09:43:32 2013
@@ -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 @@ _C_LABEL(page0rel):
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 @@ _C_LABEL(page0):
ldr pc, .Lirq_target
#ifdef __ARM_FIQ_INDIRECT
ldr pc, .Lfiq_target
-#endif
-END(page0)
-#endif /* !ARM_HAS_VBAR */
-#ifndef __ARM_FIQ_INDIRECT
-.Lfiqvector:
-#ifdef ARM_HAS_VBAR
- .set _C_LABEL(fiqvector), . - _C_LABEL(page0rel)
#else
+.Lfiqvector:
.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
