Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm More local label fixups.
details: https://anonhg.NetBSD.org/src/rev/4eeec30c7d91
branches: trunk
changeset: 535398:4eeec30c7d91
user: thorpej <thorpej%NetBSD.org@localhost>
date: Sat Aug 17 16:36:31 2002 +0000
description:
More local label fixups.
diffstat:
sys/arch/arm/arm/bcopyinout.S | 20 +++---
sys/arch/arm/arm/copystr.S | 10 +-
sys/arch/arm/arm/cpufunc_asm_ixp12x0.S | 6 +-
sys/arch/arm/arm/cpufunc_asm_sa1.S | 14 ++--
sys/arch/arm/arm/cpufunc_asm_sa11x0.S | 7 +-
sys/arch/arm/arm/cpufunc_asm_xscale.S | 20 +++---
sys/arch/arm/arm/vectors.S | 38 +++++++-------
sys/arch/arm/arm32/bcopy_page.S | 10 +-
sys/arch/arm/arm32/cpuswitch.S | 86 +++++++++++++++------------------
sys/arch/arm/arm32/fusu.S | 20 +++---
sys/arch/arm/arm32/locore.S | 18 +++---
sys/arch/arm/arm32/spl.S | 26 +++++-----
12 files changed, 134 insertions(+), 141 deletions(-)
diffs (truncated from 966 to 300 lines):
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/bcopyinout.S
--- a/sys/arch/arm/arm/bcopyinout.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/bcopyinout.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.4 2002/08/15 01:38:16 briggs Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.5 2002/08/17 16:36:31 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -39,12 +39,12 @@
#include <machine/asm.h>
-RCSID("$NetBSD: bcopyinout.S,v 1.4 2002/08/15 01:38:16 briggs Exp $")
+RCSID("$NetBSD: bcopyinout.S,v 1.5 2002/08/17 16:36:31 thorpej Exp $")
.text
.align 0
-Lcurpcb:
+.Lcurpcb:
.word _C_LABEL(curpcb)
#ifdef __PROG32
@@ -80,11 +80,11 @@
moveq pc, lr
SAVE_REGS
- ldr r4, Lcurpcb
+ ldr r4, .Lcurpcb
ldr r4, [r4]
ldr r5, [r4, #PCB_ONFAULT]
- add r3, pc, #Lcopyfault - . - 8
+ add r3, pc, #.Lcopyfault - . - 8
str r3, [r4, #PCB_ONFAULT]
PREFETCH(r0, 0)
@@ -269,7 +269,7 @@
mov pc, lr
-Lcopyfault:
+.Lcopyfault:
str r5, [r4, #PCB_ONFAULT]
RESTORE_REGS
@@ -293,11 +293,11 @@
moveq pc, lr
SAVE_REGS
- ldr r4, Lcurpcb
+ ldr r4, .Lcurpcb
ldr r4, [r4]
ldr r5, [r4, #PCB_ONFAULT]
- add r3, pc, #Lcopyfault - . - 8
+ add r3, pc, #.Lcopyfault - . - 8
str r3, [r4, #PCB_ONFAULT]
PREFETCH(r0, 0)
@@ -496,11 +496,11 @@
moveq pc, lr
SAVE_REGS
- ldr r4, Lcurpcb
+ ldr r4, .Lcurpcb
ldr r4, [r4]
ldr r5, [r4, #PCB_ONFAULT]
- add r3, pc, #Lcopyfault - . - 8
+ add r3, pc, #.Lcopyfault - . - 8
str r3, [r4, #PCB_ONFAULT]
PREFETCH(r0, 0)
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/copystr.S
--- a/sys/arch/arm/arm/copystr.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/copystr.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: copystr.S,v 1.4 2002/08/15 01:38:16 briggs Exp $ */
+/* $NetBSD: copystr.S,v 1.5 2002/08/17 16:36:31 thorpej Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -41,13 +41,13 @@
#include "assym.h"
#include <machine/asm.h>
-RCSID("$NetBSD: copystr.S,v 1.4 2002/08/15 01:38:16 briggs Exp $")
+RCSID("$NetBSD: copystr.S,v 1.5 2002/08/17 16:36:31 thorpej Exp $")
#include <sys/errno.h>
.text
.align 0
-Lcurpcb:
+.Lcurpcb:
.word _C_LABEL(curpcb)
/*
@@ -107,7 +107,7 @@
moveq r0, #ENAMETOOLONG
beq 2f
- ldr r4, Lcurpcb
+ ldr r4, .Lcurpcb
ldr r4, [r4]
#ifdef DIAGNOSTIC
@@ -154,7 +154,7 @@
moveq r0, #ENAMETOOLONG
beq 2f
- ldr r4, Lcurpcb
+ ldr r4, .Lcurpcb
ldr r4, [r4]
#ifdef DIAGNOSTIC
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/cpufunc_asm_ixp12x0.S
--- a/sys/arch/arm/arm/cpufunc_asm_ixp12x0.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_ixp12x0.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_ixp12x0.S,v 1.1 2002/07/15 16:28:04 ichiro Exp $ */
+/* $NetBSD: cpufunc_asm_ixp12x0.S,v 1.2 2002/08/17 16:36:31 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
.text
-Lixp12x0_cache_clean_addr:
+.Lixp12x0_cache_clean_addr:
.word _C_LABEL(ixp12x0_cache_clean_addr)
-Lixp12x0_cache_clean_size:
+.Lixp12x0_cache_clean_size:
.word _C_LABEL(ixp12x0_cache_clean_size)
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/cpufunc_asm_sa1.S
--- a/sys/arch/arm/arm/cpufunc_asm_sa1.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_sa1.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_sa1.S,v 1.7 2002/08/17 01:02:38 chris Exp $ */
+/* $NetBSD: cpufunc_asm_sa1.S,v 1.8 2002/08/17 16:36:32 thorpej Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -38,7 +38,7 @@
#include <machine/cpu.h>
#include <machine/asm.h>
-Lblock_userspace_access:
+.Lblock_userspace_access:
.word _C_LABEL(block_userspace_access)
/*
@@ -53,7 +53,7 @@
orr r1, r3, #(I32_bit | F32_bit)
msr cpsr_all, r1
#else
- ldr r3, Lblock_userspace_access
+ ldr r3, .Lblock_userspace_access
ldr r2, [r3]
orr r1, r2, #1
str r1, [r3]
@@ -136,9 +136,9 @@
.text
-Lsa1_cache_clean_addr:
+.Lsa1_cache_clean_addr:
.word _C_LABEL(sa1_cache_clean_addr)
-Lsa1_cache_clean_size:
+.Lsa1_cache_clean_size:
.word _C_LABEL(sa1_cache_clean_size)
#ifdef CACHE_CLEAN_BLOCK_INTR
@@ -151,7 +151,7 @@
msr cpsr_all, r3
#else
#define SA1_CACHE_CLEAN_BLOCK \
- ldr r3, Lblock_userspace_access ; \
+ ldr r3, .Lblock_userspace_access ; \
ldr ip, [r3] ; \
orr r0, ip, #1 ; \
str r0, [r3]
@@ -170,7 +170,7 @@
#define SA1_CACHE_CLEAN_PROLOGUE \
SA1_CACHE_CLEAN_BLOCK ; \
- ldr r2, Lsa1_cache_clean_addr ; \
+ ldr r2, .Lsa1_cache_clean_addr ; \
ldmia r2, {r0, r1} ; \
SA1_DOUBLE_CACHE_CLEAN_BANK
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/cpufunc_asm_sa11x0.S
--- a/sys/arch/arm/arm/cpufunc_asm_sa11x0.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_sa11x0.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_sa11x0.S,v 1.2 2002/05/03 12:43:53 rjs Exp $ */
+/* $NetBSD: cpufunc_asm_sa11x0.S,v 1.3 2002/08/17 16:36:32 thorpej Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -49,7 +49,7 @@
/* We're now 32-byte aligned */
-Lsa11x0_idle_mem:
+.Lsa11x0_idle_mem:
.word _C_LABEL(sa11x0_idle_mem) /* 1 */
/*
@@ -59,7 +59,7 @@
* We go into IDLE mode so that any IRQ or FIQ will awaken us.
*/
ENTRY(sa11x0_cpu_sleep)
- ldr r1, Lsa11x0_idle_mem /* get address of... */ /* 2 */
+ ldr r1, .Lsa11x0_idle_mem /* get address of... */ /* 2 */
nop /* 3 */
ldr r1, [r1] /* ...non-cacheable page */ /* 4 */
nop /* 5 */
@@ -122,4 +122,3 @@
ENTRY(sa11x0_drain_readbuf)
mcr p15, 0, r0, c9, c0, 0 /* drain read buffer */
mov pc, lr
-
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/cpufunc_asm_xscale.S
--- a/sys/arch/arm/arm/cpufunc_asm_xscale.S Sat Aug 17 11:45:04 2002 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_xscale.S Sat Aug 17 16:36:31 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_xscale.S,v 1.15 2002/08/14 22:53:19 thorpej Exp $ */
+/* $NetBSD: cpufunc_asm_xscale.S,v 1.16 2002/08/17 16:36:32 thorpej Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -79,7 +79,7 @@
*/
#define DCACHE_SIZE 0x00008000
-Lblock_userspace_access:
+.Lblock_userspace_access:
.word _C_LABEL(block_userspace_access)
/*
@@ -135,7 +135,7 @@
orr r1, r3, #(I32_bit | F32_bit)
msr cpsr_all, r1
#else
- ldr r3, Lblock_userspace_access
+ ldr r3, .Lblock_userspace_access
ldr r2, [r3]
orr r1, r2, #1
str r1, [r3]
@@ -245,14 +245,14 @@
.text
-Lxscale_cache_clean_addr:
+.Lxscale_cache_clean_addr:
.word _C_LABEL(xscale_cache_clean_addr)
-Lxscale_cache_clean_size:
+.Lxscale_cache_clean_size:
.word _C_LABEL(xscale_cache_clean_size)
-Lxscale_minidata_clean_addr:
+.Lxscale_minidata_clean_addr:
.word _C_LABEL(xscale_minidata_clean_addr)
-Lxscale_minidata_clean_size:
+.Lxscale_minidata_clean_size:
.word _C_LABEL(xscale_minidata_clean_size)
#ifdef CACHE_CLEAN_BLOCK_INTR
@@ -265,7 +265,7 @@
msr cpsr_all, r3
#else
#define XSCALE_CACHE_CLEAN_BLOCK \
- ldr r3, Lblock_userspace_access ; \
+ ldr r3, .Lblock_userspace_access ; \
ldr ip, [r3] ; \
orr r0, ip, #1 ; \
str r0, [r3]
@@ -276,7 +276,7 @@
#define XSCALE_CACHE_CLEAN_PROLOGUE \
XSCALE_CACHE_CLEAN_BLOCK ; \
- ldr r2, Lxscale_cache_clean_addr ; \
+ ldr r2, .Lxscale_cache_clean_addr ; \
ldmia r2, {r0, r1} ; \
/* \
* BUG ALERT! \
@@ -327,7 +327,7 @@
* while we clean it.
*/
ENTRY(xscale_cache_clean_minidata)
- ldr r2, Lxscale_minidata_clean_addr
+ ldr r2, .Lxscale_minidata_clean_addr
ldmia r2, {r0, r1}
1: ldr r3, [r0], #32
subs r1, r1, #32
diff -r c984048dcd8b -r 4eeec30c7d91 sys/arch/arm/arm/vectors.S
Home |
Main Index |
Thread Index |
Old Index