Module Name: src
Committed By: matt
Date: Mon Aug 12 16:02:50 UTC 2013
Modified Files:
src/sys/arch/acorn26/acorn26: bus_asm.S locore.S
Log Message:
Convert to unified syntax
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn26/acorn26/bus_asm.S
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/acorn26/acorn26/locore.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/acorn26/acorn26/bus_asm.S
diff -u src/sys/arch/acorn26/acorn26/bus_asm.S:1.5 src/sys/arch/acorn26/acorn26/bus_asm.S:1.6
--- src/sys/arch/acorn26/acorn26/bus_asm.S:1.5 Wed Oct 4 20:14:44 2006
+++ src/sys/arch/acorn26/acorn26/bus_asm.S Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $ */
+/* $NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $ */
/*
* Copyright (c) 2006 Ben Harris
@@ -59,7 +59,7 @@
*/
#include <machine/asm.h>
-RCSID("$NetBSD: bus_asm.S,v 1.5 2006/10/04 20:14:44 bjh21 Exp $")
+RCSID("$NetBSD: bus_asm.S,v 1.6 2013/08/12 16:02:50 matt Exp $")
/*
* bus_space I/O functions for podulebus
@@ -109,7 +109,7 @@ ENTRY(iobus_bs_rm_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r0]
@@ -128,7 +128,7 @@ ENTRY(iobus_bs_rm_2)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldr r1, [r0]
@@ -153,7 +153,7 @@ ENTRY(iobus_bs_wm_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -172,7 +172,7 @@ ENTRY(iobus_bs_wm_2)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -200,7 +200,7 @@ ENTRY(iobus_bs_rr_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r12], r0
@@ -249,7 +249,7 @@ ENTRY(iobus_bs_rr_2)
bgt 1b
2: teq r10, #0
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
/*
* Fast read_region_2 code. This is at its best when dealing with
@@ -272,7 +272,7 @@ ENTRY(iobus_bs_rr_2)
stmia r9!, {r0, r2, r4, r6}
bgt 2b
adds r7, r10, #7
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
mov r0, #4
mov r10, #0
b 1b
@@ -292,7 +292,7 @@ ENTRY(iobus_bs_wr_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
ldrb r1, [r3], #0x0001
@@ -335,7 +335,7 @@ ENTRY(iobus_bs_wr_2)
bgt 1b
2: teq r10, #0
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
/*
* Fast write_region_2 code. This is at its best when dealing with
@@ -366,7 +366,7 @@ ENTRY(iobus_bs_wr_2)
stmia r8!, {r0-r7}
bgt 2b
adds r7, r10, #7
- ldmeqdb fp, {r4-r10, fp, sp, pc}
+ ldmdbeq fp, {r4-r10, fp, sp, pc}
mov r0, #4
mov r10, #0
b 1b
@@ -384,7 +384,7 @@ ENTRY(iobus_bs_sm_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
strb r3, [r0]
@@ -402,7 +402,7 @@ ENTRY(iobus_bs_sm_2)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
orr r3, r3, r3, lsl #16
1:
@@ -427,7 +427,7 @@ ENTRY(iobus_bs_sr_1)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
1:
strb r3, [r12], r0
@@ -447,7 +447,7 @@ ENTRY(iobus_bs_sr_2)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- ldmledb fp, {fp, sp, pc}
+ ldmdble fp, {fp, sp, pc}
orr r3, r3, r3, lsl #16
1:
Index: src/sys/arch/acorn26/acorn26/locore.S
diff -u src/sys/arch/acorn26/acorn26/locore.S:1.22 src/sys/arch/acorn26/acorn26/locore.S:1.23
--- src/sys/arch/acorn26/acorn26/locore.S:1.22 Thu Dec 10 05:10:00 2009
+++ src/sys/arch/acorn26/acorn26/locore.S Mon Aug 12 16:02:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.22 2009/12/10 05:10:00 rmind Exp $ */
+/* $NetBSD: locore.S,v 1.23 2013/08/12 16:02:50 matt Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 Ben Harris
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -353,7 +353,7 @@ ENTRY_NP(int_off_save)
/* LINTSTUB: Func: void int_restore(int i) */
ENTRY_NP(int_restore)
tst r0, #(R15_IRQ_DISABLE) /* Were IRQs already disabled? */
- biceqs r15, r14, #(R15_IRQ_DISABLE) /* No, enable again */
+ bicseq r15, r14, #(R15_IRQ_DISABLE) /* No, enable again */
movs r15, r14 /* Yes, just return */
/* LINTSTUB: Func: void fiq_off(void) */
ENTRY(fiq_off)
@@ -452,4 +452,4 @@ ENTRY(cpu_Debugger)
ldmfd r13!, {pc}
#endif
-RCSID("$NetBSD: locore.S,v 1.22 2009/12/10 05:10:00 rmind Exp $")
+RCSID("$NetBSD: locore.S,v 1.23 2013/08/12 16:02:50 matt Exp $")
