Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm Move parts of cpu.h that are not needed by MI c...
details: https://anonhg.NetBSD.org/src/rev/00b9a5fa46d8
branches: trunk
changeset: 789394:00b9a5fa46d8
user: matt <matt%NetBSD.org@localhost>
date: Sun Aug 18 06:28:18 2013 +0000
description:
Move parts of cpu.h that are not needed by MI code in <arm/locore.h>
Don't include <machine/cpu.h> or <machine/frame.h>, use <arm/locore.h>
Use <arm/asm.h> instead of <machine/arm.h>
diffstat:
sys/arch/arm/arm/arm_machdep.c | 6 +-
sys/arch/arm/arm/ast.c | 10 +-
sys/arch/arm/arm/bcopyinout.S | 13 +-
sys/arch/arm/arm/bcopyinout_xscale.S | 8 +-
sys/arch/arm/arm/blockio.S | 32 +++--
sys/arch/arm/arm/bus_space_a2x.S | 10 +-
sys/arch/arm/arm/bus_space_a4x.S | 8 +-
sys/arch/arm/arm/bus_space_asm_generic.S | 6 +-
sys/arch/arm/arm/bus_space_notimpl.S | 15 +-
sys/arch/arm/arm/copystr.S | 23 ++-
sys/arch/arm/arm/cpufunc_asm.S | 50 ++++++---
sys/arch/arm/arm/cpufunc_asm_arm10.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_arm11.S | 16 ++-
sys/arch/arm/arm/cpufunc_asm_arm1136.S | 7 +-
sys/arch/arm/arm/cpufunc_asm_arm11x6.S | 7 +-
sys/arch/arm/arm/cpufunc_asm_arm3.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_arm67.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_arm7tdmi.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_arm8.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_arm9.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_armv4.S | 19 ++-
sys/arch/arm/arm/cpufunc_asm_armv5.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_armv5_ec.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_armv6.S | 17 ++-
sys/arch/arm/arm/cpufunc_asm_armv7.S | 2 +-
sys/arch/arm/arm/cpufunc_asm_fa526.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_ixp12x0.S | 6 +-
sys/arch/arm/arm/cpufunc_asm_pj4b.S | 6 +-
sys/arch/arm/arm/cpufunc_asm_sa1.S | 6 +-
sys/arch/arm/arm/cpufunc_asm_sa11x0.S | 6 +-
sys/arch/arm/arm/cpufunc_asm_sheeva.S | 4 +-
sys/arch/arm/arm/cpufunc_asm_xscale.S | 44 ++++++-
sys/arch/arm/arm/fiq_subr.S | 25 ++++-
sys/arch/arm/arm/fusu.S | 28 +++-
sys/arch/arm/arm/idle_machdep.c | 7 +-
sys/arch/arm/arm/lock_cas.S | 7 +-
sys/arch/arm/arm/process_machdep.c | 12 +-
sys/arch/arm/arm/sig_machdep.c | 9 +-
sys/arch/arm/arm/syscall.c | 18 +-
sys/arch/arm/arm/undefined.c | 30 ++++-
sys/arch/arm/arm/vectors.S | 4 +-
sys/arch/arm/arm32/arm32_boot.c | 5 +-
sys/arch/arm/arm32/arm32_machdep.c | 6 +-
sys/arch/arm/arm32/arm32_reboot.c | 5 +-
sys/arch/arm/arm32/bcopy_page.S | 22 ++-
sys/arch/arm/arm32/cpu.c | 6 +-
sys/arch/arm/arm32/cpuswitch.S | 22 ++-
sys/arch/arm/arm32/exception.S | 78 ++++++++------
sys/arch/arm/arm32/fault.c | 8 +-
sys/arch/arm/arm32/irq_dispatch.S | 18 ++-
sys/arch/arm/arm32/locore.S | 25 ++-
sys/arch/arm/arm32/setcpsr.S | 10 +-
sys/arch/arm/arm32/setstack.S | 12 +-
sys/arch/arm/arm32/spl.S | 8 +-
sys/arch/arm/arm32/sys_machdep.c | 5 +-
sys/arch/arm/include/cpu.h | 156 ++----------------------------
sys/arch/arm/iomd/iomd_fiq.S | 8 +-
sys/arch/arm/iomd/iomd_irq.S | 7 +-
sys/arch/arm/mainbus/mainbus_io_asm.S | 31 +++--
sys/arch/arm/ofw/ofw_irq.S | 8 +-
sys/arch/arm/omap/omap_nobyteacc_io.S | 24 +++-
sys/arch/arm/sa11x0/sa11x0_irq.S | 8 +-
sys/arch/arm/vfp/vfp_init.c | 3 +-
sys/arch/arm/xscale/i80200_irq.S | 7 +-
sys/arch/arm/xscale/pxa2x0_apm_asm.S | 4 +-
65 files changed, 524 insertions(+), 459 deletions(-)
diffs (truncated from 3226 to 300 lines):
diff -r d1ad8f104b00 -r 00b9a5fa46d8 sys/arch/arm/arm/arm_machdep.c
--- a/sys/arch/arm/arm/arm_machdep.c Sun Aug 18 05:54:16 2013 +0000
+++ b/sys/arch/arm/arm/arm_machdep.c Sun Aug 18 06:28:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.36 2012/08/31 23:59:51 matt Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.37 2013/08/18 06:28:18 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -78,7 +78,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.36 2012/08/31 23:59:51 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.37 2013/08/18 06:28:18 matt Exp $");
#include <sys/exec.h>
#include <sys/proc.h>
@@ -94,7 +94,7 @@
#include <sys/exec_aout.h>
#endif
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
#include <machine/vmparam.h>
diff -r d1ad8f104b00 -r 00b9a5fa46d8 sys/arch/arm/arm/ast.c
--- a/sys/arch/arm/arm/ast.c Sun Aug 18 05:54:16 2013 +0000
+++ b/sys/arch/arm/arm/ast.c Sun Aug 18 06:28:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.21 2012/08/16 17:35:01 matt Exp $ */
+/* $NetBSD: ast.c,v 1.22 2013/08/18 06:28:18 matt Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,11 +41,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.21 2012/08/16 17:35:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.22 2013/08/18 06:28:18 matt Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
+#include <sys/cpu.h>
#include <sys/proc.h>
#include <sys/acct.h>
#include <sys/systm.h>
@@ -54,10 +55,7 @@
#include <sys/vmmeter.h>
#include <sys/userret.h>
-#include <machine/cpu.h>
-#include <machine/frame.h>
-
-#include <arm/cpufunc.h>
+#include <arm/locore.h>
#include <uvm/uvm_extern.h>
diff -r d1ad8f104b00 -r 00b9a5fa46d8 sys/arch/arm/arm/bcopyinout.S
--- a/sys/arch/arm/arm/bcopyinout.S Sun Aug 18 05:54:16 2013 +0000
+++ b/sys/arch/arm/arm/bcopyinout.S Sun Aug 18 06:28:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.19 2012/10/29 14:09:38 chs Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.20 2013/08/18 06:28:18 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -41,7 +41,8 @@
#include "assym.h"
#include <machine/asm.h>
-#include <machine/cpu.h>
+
+#include <arm/locore.h>
#if defined(__XSCALE__) || defined(_ARM_ARCH_6)
/*
@@ -51,7 +52,7 @@
#include "bcopyinout_xscale.S"
#else
-RCSID("$NetBSD: bcopyinout.S,v 1.19 2012/10/29 14:09:38 chs Exp $")
+RCSID("$NetBSD: bcopyinout.S,v 1.20 2013/08/18 06:28:18 matt Exp $")
.text
.align 0
@@ -282,6 +283,7 @@
RESTORE_REGS
RET
+END(copyin)
/*
* r0 = kernel space address
@@ -485,6 +487,7 @@
RESTORE_REGS
RET
+END(copyout)
/*
* r0 = kernel space source address
@@ -676,6 +679,7 @@
RESTORE_REGS
RET
+END(kcopy)
#endif /* !__XSCALE__ */
#ifdef __PROG32
@@ -701,6 +705,7 @@
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
RET
+END(badaddr_read_1)
/*
* int badaddr_read_2(const uint16_t *src, uint16_t *dest)
@@ -724,6 +729,7 @@
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
RET
+END(badaddr_read_2)
/*
* int badaddr_read_4(const uint32_t *src, uint32_t *dest)
@@ -747,4 +753,5 @@
mov r0, #0 /* No fault */
1: str ip, [r2, #PCB_ONFAULT]
RET
+END(badaddr_read_4)
#endif /* __PROG32 */
diff -r d1ad8f104b00 -r 00b9a5fa46d8 sys/arch/arm/arm/bcopyinout_xscale.S
--- a/sys/arch/arm/arm/bcopyinout_xscale.S Sun Aug 18 05:54:16 2013 +0000
+++ b/sys/arch/arm/arm/bcopyinout_xscale.S Sun Aug 18 06:28:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout_xscale.S,v 1.9 2013/08/12 05:54:51 matt Exp $ */
+/* $NetBSD: bcopyinout_xscale.S,v 1.10 2013/08/18 06:28:18 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID("$NetBSD: bcopyinout_xscale.S,v 1.9 2013/08/12 05:54:51 matt Exp $")
+RCSID("$NetBSD: bcopyinout_xscale.S,v 1.10 2013/08/18 06:28:18 matt Exp $")
.text
.align 0
@@ -457,6 +457,7 @@
ldrbt ip, [r0]
strb ip, [r1]
RET
+END(copyin)
/*
@@ -896,7 +897,7 @@
ldrb ip, [r0]
strbt ip, [r1]
RET
-
+END(copyout)
/*
* r0 = kernel space source address
@@ -1314,3 +1315,4 @@
ldrb ip, [r0]
strb ip, [r1]
RET
+END(kcopy)
diff -r d1ad8f104b00 -r 00b9a5fa46d8 sys/arch/arm/arm/blockio.S
--- a/sys/arch/arm/arm/blockio.S Sun Aug 18 05:54:16 2013 +0000
+++ b/sys/arch/arm/arm/blockio.S Sun Aug 18 06:28:18 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blockio.S,v 1.7 2013/08/11 03:09:41 matt Exp $ */
+/* $NetBSD: blockio.S,v 1.8 2013/08/18 06:29:29 matt Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -48,7 +48,7 @@
#include <machine/asm.h>
-RCSID("$NetBSD: blockio.S,v 1.7 2013/08/11 03:09:41 matt Exp $")
+RCSID("$NetBSD: blockio.S,v 1.8 2013/08/18 06:29:29 matt Exp $")
/*
* Read bytes from an I/O address into a block of memory
@@ -101,6 +101,7 @@
ldrbgt r3, [r0]
strbgt r3, [r1], #1
ldmdb fp, {fp, sp, pc}
+END(read_multi_1)
/*
* Write bytes to an I/O address from a block of memory
@@ -152,6 +153,7 @@
ldrbgt r3, [r1], #1
strbgt r3, [r0]
ldmdb fp, {fp, sp, pc}
+END(write_multi_1)
/*
* Reads short ints (16 bits) from an I/O address into a block of memory
@@ -164,7 +166,7 @@
ENTRY(insw)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- movle pc, lr
+ RETc(le)
/* If the destination address and the size is word aligned, do it fast */
@@ -182,7 +184,7 @@
strb r3, [r1], #0x0001
bgt .Linswloop
- mov pc, lr
+ RET
/* Word aligned insw */
@@ -198,7 +200,8 @@
subs r2, r2, #0x00000002 /* Next */
bgt .Lfastinswloop
- mov pc, lr
+ RET
+END(insw)
/*
@@ -212,7 +215,7 @@
ENTRY(outsw)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- movle pc, lr
+ RETc(le)
/* If the destination address and the size is word aligned, do it fast */
@@ -231,7 +234,7 @@
str r3, [r0]
bgt .Loutswloop
- mov pc, lr
+ RET
/* Word aligned outsw */
@@ -259,7 +262,8 @@
bgt .Lfastoutswloop
- mov pc, lr
+ RET
+END(outsw)
/*
* reads short ints (16 bits) from an I/O address into a block of memory
@@ -274,7 +278,7 @@
ENTRY(insw16)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- movle pc, lr
+ RETc(le)
/* If the destination address is word aligned and the size suitably
aligned, do it fast */
@@ -318,6 +322,7 @@
bgt .Linsw16loop
pop {r4,r5,pc} /* Restore regs and go home */
+END(insw16)
/*
@@ -331,7 +336,7 @@
ENTRY(outsw16)
/* Make sure that we have a positive length */
cmp r2, #0x00000000
- movle pc, lr
+ RETc(le)
/* If the destination address is word aligned and the size suitably
aligned, do it fast */
@@ -385,6 +390,7 @@
bgt .Loutsw16loop
pop {r4,r5,pc} /* and go home */
+END(outsw16)
/*
* reads short ints (16 bits) from an I/O address into a block of memory
Home |
Main Index |
Thread Index |
Old Index