summaryrefslogtreecommitdiff
path: root/sys/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/arm')
-rw-r--r--sys/arch/arm/arm/bcopyinout.S6
-rw-r--r--sys/arch/arm/arm/bus_space_notimpl.S6
-rw-r--r--sys/arch/arm/arm/copystr.S8
-rw-r--r--sys/arch/arm/arm/cpufunc_asm_armv7.S10
-rw-r--r--sys/arch/arm/arm/cpuswitch7.S10
-rw-r--r--sys/arch/arm/arm/exception.S34
-rw-r--r--sys/arch/arm/arm/fiq_subr.S8
-rw-r--r--sys/arch/arm/arm/in_cksum_arm.S6
-rw-r--r--sys/arch/arm/arm/irq_dispatch.S10
-rw-r--r--sys/arch/arm/arm/locore.S20
-rw-r--r--sys/arch/arm/arm/sigcode.S10
-rw-r--r--sys/arch/arm/arm/vectors.S20
-rw-r--r--sys/arch/arm/include/asm.h10
-rw-r--r--sys/arch/arm/include/frame.h6
14 files changed, 82 insertions, 82 deletions
diff --git a/sys/arch/arm/arm/bcopyinout.S b/sys/arch/arm/arm/bcopyinout.S
index 3760c575c09..0caaa70b9b5 100644
--- a/sys/arch/arm/arm/bcopyinout.S
+++ b/sys/arch/arm/arm/bcopyinout.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: bcopyinout.S,v 1.9 2018/08/06 18:39:13 kettenis Exp $ */
+/* $OpenBSD: bcopyinout.S,v 1.10 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: bcopyinout.S,v 1.13 2003/10/31 16:54:05 scw Exp $ */
/*
@@ -48,10 +48,10 @@
#ifdef MULTIPROCESSOR
.Lcpu_info:
- .word _C_LABEL(cpu_info)
+ .word cpu_info
#else
.Lcpu_info_primary:
- .word _C_LABEL(cpu_info_primary)
+ .word cpu_info_primary
#endif
#define SAVE_REGS stmfd sp!, {r4-r11}
diff --git a/sys/arch/arm/arm/bus_space_notimpl.S b/sys/arch/arm/arm/bus_space_notimpl.S
index 70b0f091d43..bc861ebe7f3 100644
--- a/sys/arch/arm/arm/bus_space_notimpl.S
+++ b/sys/arch/arm/arm/bus_space_notimpl.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus_space_notimpl.S,v 1.3 2016/09/21 11:33:05 kettenis Exp $ */
+/* $OpenBSD: bus_space_notimpl.S,v 1.4 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: bus_space_notimpl.S,v 1.2 2001/09/10 02:20:19 reinoud Exp $ */
/*
@@ -46,7 +46,7 @@
#define NAME(func) __C(BUS_SPACE,__C(_bs_,func))
#define LNAME(func) __C(L,NAME(func))
-#define __L(x) _C_LABEL(x)
+#define __L(x) x
#define GLOBAL(func) .global __L(NAME(func))
#define LABEL(func) __L(NAME(func)):
#define LLABEL(func) LNAME(func):
@@ -73,7 +73,7 @@ bs_notimpl_panic:
adr r0, bs_notimpl_message
mov r1, r4
mov r2, sp
- b _C_LABEL(panic)
+ b panic
diff --git a/sys/arch/arm/arm/copystr.S b/sys/arch/arm/arm/copystr.S
index b002542b923..956e8658e75 100644
--- a/sys/arch/arm/arm/copystr.S
+++ b/sys/arch/arm/arm/copystr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: copystr.S,v 1.9 2018/08/06 18:39:13 kettenis Exp $ */
+/* $OpenBSD: copystr.S,v 1.10 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: copystr.S,v 1.8 2002/10/13 14:54:48 bjh21 Exp $ */
/*
@@ -50,10 +50,10 @@
.align 2
#ifdef MULTIPROCESSOR
.Lcpu_info:
- .word _C_LABEL(cpu_info)
+ .word cpu_info
#else
.Lcpu_info_primary:
- .word _C_LABEL(cpu_info_primary)
+ .word cpu_info_primary
#endif
/*
@@ -200,7 +200,7 @@ ENTRY(copyoutstr)
mov r1, r0
adr r0, Lcopystrpcbfaulttext
bic sp, sp, #7 /* align stack to 8 bytes */
- b _C_LABEL(panic)
+ b panic
Lcopystrpcbfaulttext:
.asciz "No valid PCB during copyinoutstr() addr1=%08x addr2=%08x\n"
diff --git a/sys/arch/arm/arm/cpufunc_asm_armv7.S b/sys/arch/arm/arm/cpufunc_asm_armv7.S
index 84b37962d17..ab805529ac8 100644
--- a/sys/arch/arm/arm/cpufunc_asm_armv7.S
+++ b/sys/arch/arm/arm/cpufunc_asm_armv7.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpufunc_asm_armv7.S,v 1.18 2020/01/06 19:12:39 kettenis Exp $ */
+/* $OpenBSD: cpufunc_asm_armv7.S,v 1.19 2022/12/08 01:25:44 guenther Exp $ */
/*
* Copyright (c) 2008 Dale Rahn <drahn@openbsd.org>
*
@@ -89,11 +89,11 @@ ENTRY(armv7_tlb_flushD)
* operations.
*/
.Larmv7_dcache_line_size:
- .word _C_LABEL(arm_dcache_min_line_size)
+ .word arm_dcache_min_line_size
.Larmv7_icache_line_size:
- .word _C_LABEL(arm_icache_min_line_size)
+ .word arm_icache_min_line_size
.Larmv7_idcache_line_size:
- .word _C_LABEL(arm_idcache_min_line_size)
+ .word arm_idcache_min_line_size
s_max .req r0
i_max .req r1
@@ -238,7 +238,7 @@ ENTRY(armv7_context_switch)
/* XXX The following macros should probably be moved to asm.h */
#define _DATA_OBJECT(x) .globl x; .type x,_ASM_TYPE_OBJECT; x:
-#define C_OBJECT(x) _DATA_OBJECT(_C_LABEL(x))
+#define C_OBJECT(x) _DATA_OBJECT(x)
.align 2
C_OBJECT(armv7_dcache_sets_max)
diff --git a/sys/arch/arm/arm/cpuswitch7.S b/sys/arch/arm/arm/cpuswitch7.S
index c3ea66df10e..a422a6b9486 100644
--- a/sys/arch/arm/arm/cpuswitch7.S
+++ b/sys/arch/arm/arm/cpuswitch7.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuswitch7.S,v 1.16 2020/03/11 21:04:58 deraadt Exp $ */
+/* $OpenBSD: cpuswitch7.S,v 1.17 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: cpuswitch.S,v 1.41 2003/11/15 08:44:18 scw Exp $ */
/*
@@ -97,10 +97,10 @@
.text
.Lcpufuncs:
- .word _C_LABEL(cpufuncs)
+ .word cpufuncs
.Lcpu_do_powersave:
- .word _C_LABEL(cpu_do_powersave)
+ .word cpu_do_powersave
/*
* Idle loop, exercised while waiting for a process to wake up.
@@ -222,10 +222,10 @@ ENTRY(savectx)
ENTRY(proc_trampoline)
#ifdef MULTIPROCESSOR
- bl _C_LABEL(proc_trampoline_mp)
+ bl proc_trampoline_mp
#endif
mov r0, #(IPL_NONE)
- bl _C_LABEL(_spllower)
+ bl _spllower
mov r0, r5
mov r1, sp
diff --git a/sys/arch/arm/arm/exception.S b/sys/arch/arm/arm/exception.S
index 908912a2176..b436dafe5a5 100644
--- a/sys/arch/arm/arm/exception.S
+++ b/sys/arch/arm/arm/exception.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: exception.S,v 1.10 2020/03/11 21:04:58 deraadt Exp $ */
+/* $OpenBSD: exception.S,v 1.11 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: exception.S,v 1.13 2003/10/31 16:30:15 scw Exp $ */
/*
@@ -60,7 +60,7 @@
and r0, r0, #(PSR_MODE) /* Returning to USR mode? */ ;\
cmp r0, #(PSR_USR32_MODE) ;\
bne 1f ;\
- bl _C_LABEL(vfp_enable) ;\
+ bl vfp_enable ;\
1:
AST_LOCALS
@@ -73,7 +73,7 @@ AST_LOCALS
ASENTRY_NP(reset_entry)
adr r0, Lreset_panicmsg
mov r1, lr
- bl _C_LABEL(panic)
+ bl panic
/* NOTREACHED */
Lreset_panicmsg:
.asciz "Reset vector called, LR = 0x%08x"
@@ -88,7 +88,7 @@ ASENTRY_NP(swi_entry)
PUSHFRAME
mov r0, sp /* Pass the frame to any function */
- bl _C_LABEL(swi_handler) /* It's a SWI ! */
+ bl swi_handler /* It's a SWI ! */
DO_AST
PULLFRAME
@@ -112,18 +112,18 @@ ASENTRY_NP(prefetch_abort_entry)
ldr pc, [r1]
Lprefetch_abort_handler_address:
- .word _C_LABEL(prefetch_abort_handler_address)
+ .word prefetch_abort_handler_address
.data
- .global _C_LABEL(prefetch_abort_handler_address)
+ .global prefetch_abort_handler_address
-_C_LABEL(prefetch_abort_handler_address):
+prefetch_abort_handler_address:
.word abortprefetch
.text
abortprefetch:
adr r0, abortprefetchmsg
- b _C_LABEL(panic)
+ b panic
abortprefetchmsg:
.asciz "abortprefetch"
@@ -146,17 +146,17 @@ ASENTRY_NP(data_abort_entry)
ldr pc, [r1]
Ldata_abort_handler_address:
- .word _C_LABEL(data_abort_handler_address)
+ .word data_abort_handler_address
.data
- .global _C_LABEL(data_abort_handler_address)
-_C_LABEL(data_abort_handler_address):
+ .global data_abort_handler_address
+data_abort_handler_address:
.word abortdata
.text
abortdata:
adr r0, abortdatamsg
- b _C_LABEL(panic)
+ b panic
abortdatamsg:
.asciz "abortdata"
@@ -176,7 +176,7 @@ ASENTRY_NP(address_exception_entry)
mrs r2, spsr
mov r3, lr
adr r0, Laddress_exception_msg
- bl _C_LABEL(printf) /* XXX CLOBBERS LR!! */
+ bl printf /* XXX CLOBBERS LR!! */
b data_abort_entry
Laddress_exception_msg:
.asciz "Address Exception CPSR=0x%08x SPSR=0x%08x LR=0x%08x\n"
@@ -232,7 +232,7 @@ ENTRY_NP(undefinedinstruction_bounce)
mov r0, sp
adr lr, exception_exit
- b _C_LABEL(undefinedinstruction)
+ b undefinedinstruction
.data
.align 2
@@ -247,6 +247,6 @@ Lundefined_handler_indirection_data:
.word 0
.word 0
- .global _C_LABEL(undefined_handler_address)
-_C_LABEL(undefined_handler_address):
- .word _C_LABEL(undefinedinstruction_bounce)
+ .global undefined_handler_address
+undefined_handler_address:
+ .word undefinedinstruction_bounce
diff --git a/sys/arch/arm/arm/fiq_subr.S b/sys/arch/arm/arm/fiq_subr.S
index 7b805ec06ab..0d00aa5cc93 100644
--- a/sys/arch/arm/arm/fiq_subr.S
+++ b/sys/arch/arm/arm/fiq_subr.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: fiq_subr.S,v 1.4 2015/01/18 14:55:02 jsg Exp $ */
+/* $OpenBSD: fiq_subr.S,v 1.5 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: fiq_subr.S,v 1.3 2002/04/12 18:50:31 thorpej Exp $ */
/*
@@ -86,7 +86,7 @@ ENTRY(fiq_setregs)
* Null handler copied down to the FIQ vector when the last
* FIQ handler is removed.
*/
- .global _C_LABEL(fiq_nullhandler), _C_LABEL(fiq_nullhandler_end)
-_C_LABEL(fiq_nullhandler):
+ .global fiq_nullhandler, fiq_nullhandler_end
+fiq_nullhandler:
subs pc, lr, #4
-_C_LABEL(fiq_nullhandler_end):
+fiq_nullhandler_end:
diff --git a/sys/arch/arm/arm/in_cksum_arm.S b/sys/arch/arm/arm/in_cksum_arm.S
index 21fbf28e9e1..5710def6caf 100644
--- a/sys/arch/arm/arm/in_cksum_arm.S
+++ b/sys/arch/arm/arm/in_cksum_arm.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_cksum_arm.S,v 1.8 2020/02/28 11:38:56 jsg Exp $ */
+/* $OpenBSD: in_cksum_arm.S,v 1.9 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: in_cksum_arm.S,v 1.3 2003/11/26 10:31:53 rearnsha Exp $ */
/*
@@ -74,7 +74,7 @@ ENTRY(in_cksum)
eor r11, r10, r0
add r10, r10, r1
adds r2, r1, #0x00
- blne _ASM_LABEL(L_cksumdata)
+ blne L_cksumdata
tst r11, #0x01
movne r2, r2, ror #8
adds r8, r8, r2
@@ -186,7 +186,7 @@ ENTRY(in4_cksum)
.Lin4_cksum_whoops:
adr r0, .Lin4_cksum_whoops_str
- bl _C_LABEL(panic)
+ bl panic
.Lin4_cksum_whoops_str:
.asciz "in4_cksum: out of mbufs\n"
.align 5
diff --git a/sys/arch/arm/arm/irq_dispatch.S b/sys/arch/arm/arm/irq_dispatch.S
index f6228cdc014..9f50aa5f95a 100644
--- a/sys/arch/arm/arm/irq_dispatch.S
+++ b/sys/arch/arm/arm/irq_dispatch.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: irq_dispatch.S,v 1.16 2020/03/11 21:04:58 deraadt Exp $ */
+/* $OpenBSD: irq_dispatch.S,v 1.17 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: irq_dispatch.S,v 1.5 2003/10/30 08:57:24 scw Exp $ */
/*
@@ -88,10 +88,10 @@
.text
.align 2
.Lcpu_info_primary:
- .word _C_LABEL(cpu_info_primary)
+ .word cpu_info_primary
#define STOREVFP \
- bl _C_LABEL(vfp_save)
+ bl vfp_save
AST_LOCALS
@@ -134,6 +134,6 @@ ASENTRY_NP(irq_entry)
.bss
.align 2
- .global _C_LABEL(astpending)
-_C_LABEL(astpending):
+ .global astpending
+astpending:
.word 0
diff --git a/sys/arch/arm/arm/locore.S b/sys/arch/arm/arm/locore.S
index aa7d31bf558..ab5744fb221 100644
--- a/sys/arch/arm/arm/locore.S
+++ b/sys/arch/arm/arm/locore.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.S,v 1.22 2020/05/18 17:24:03 deraadt Exp $ */
+/* $OpenBSD: locore.S,v 1.23 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: locore.S,v 1.14 2003/04/20 16:21:40 thorpej Exp $ */
/*
@@ -79,7 +79,7 @@ ASENTRY_NP(start)
mov r1, r5
mov r2, r6
mov r3, r7
- bl _C_LABEL(initarm) /* Off we go */
+ bl initarm /* Off we go */
/* init arm will return the new stack pointer. */
mov sp, r0
@@ -89,16 +89,16 @@ ASENTRY_NP(start)
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
- bl _C_LABEL(main) /* call main()! */
+ bl main /* call main()! */
adr r0, .Lmainreturned
- b _C_LABEL(panic)
+ b panic
/* NOTREACHED */
.Lstart:
.word _edata
.word _end
- .word _C_LABEL(cpu_info_primary)
+ .word cpu_info_primary
.word svcstk + INIT_ARM_STACK_SIZE
.Lmainreturned:
@@ -215,7 +215,7 @@ svcstk:
/* OFW based systems will use OF_boot() */
.Lcpufuncs:
- .word _C_LABEL(cpufuncs)
+ .word cpufuncs
ENTRY_NP(cpu_reset)
mrs r2, cpsr
@@ -247,7 +247,7 @@ ENTRY_NP(cpu_reset)
* This variable is provided by the hardware specific code
*/
.Lcpu_reset_address:
- .word _C_LABEL(cpu_reset_address)
+ .word cpu_reset_address
#endif /* OFW */
@@ -268,8 +268,8 @@ ENTRY(longjmp)
.data
.align 2
- .global _C_LABEL(esym)
-_C_LABEL(esym): .word _C_LABEL(end)
+ .global esym
+esym: .word end
ENTRY_NP(abort)
- b _C_LABEL(abort)
+ b abort
diff --git a/sys/arch/arm/arm/sigcode.S b/sys/arch/arm/arm/sigcode.S
index 4e003958537..a6a842df292 100644
--- a/sys/arch/arm/arm/sigcode.S
+++ b/sys/arch/arm/arm/sigcode.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: sigcode.S,v 1.11 2021/06/28 18:21:08 kettenis Exp $ */
+/* $OpenBSD: sigcode.S,v 1.12 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: sigcode.S,v 1.6 2003/10/05 19:44:58 matt Exp $ */
/*
@@ -59,15 +59,15 @@ sigcode:
swi 0
dsb nsh
isb
- .globl _C_LABEL(sigcoderet)
-_C_LABEL(sigcoderet):
+ .globl sigcoderet
+sigcoderet:
/* Well if that failed we better exit quick ! */
mov r12, #SYS_exit
swi 0
dsb nsh
isb
- .global _C_LABEL(esigcode)
-_C_LABEL(esigcode):
+ .global esigcode
+esigcode:
.globl sigfill
sigfill:
diff --git a/sys/arch/arm/arm/vectors.S b/sys/arch/arm/arm/vectors.S
index 6d3722d45b1..c4411c2ccb7 100644
--- a/sys/arch/arm/arm/vectors.S
+++ b/sys/arch/arm/arm/vectors.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: vectors.S,v 1.3 2018/08/06 18:39:13 kettenis Exp $ */
+/* $OpenBSD: vectors.S,v 1.4 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: vectors.S,v 1.4 2002/08/17 16:36:32 thorpej Exp $ */
/*
@@ -46,10 +46,10 @@
.text
.align 2
- .global _C_LABEL(page0), _C_LABEL(page0_data), _C_LABEL(page0_end)
- .global _C_LABEL(fiqvector)
+ .global page0, page0_data, page0_end
+ .global fiqvector
-_C_LABEL(page0):
+page0:
ldr pc, .Lreset_target
ldr pc, .Lundefined_target
ldr pc, .Lswi_target
@@ -61,12 +61,12 @@ _C_LABEL(page0):
ldr pc, .Lfiq_target
#else
.Lfiqvector:
- .set _C_LABEL(fiqvector), . - _C_LABEL(page0)
+ .set fiqvector, . - page0
subs pc, lr, #4
.org .Lfiqvector + 0x100
#endif
-_C_LABEL(page0_data):
+page0_data:
.Lreset_target:
.word reset_entry
@@ -90,16 +90,16 @@ _C_LABEL(page0_data):
#ifdef __ARM_FIQ_INDIRECT
.Lfiq_target:
- .word _C_LABEL(fiqvector)
+ .word fiqvector
#else
.word 0 /* pad it out */
#endif
-_C_LABEL(page0_end):
+page0_end:
#ifdef __ARM_FIQ_INDIRECT
.data
.align 2
-_C_LABEL(fiqvector):
+fiqvector:
subs pc, lr, #4
- .org _C_LABEL(fiqvector) + 0x100
+ .org fiqvector + 0x100
#endif
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index d67f1bc9a28..f9b399bd821 100644
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.12 2022/08/30 16:26:29 miod Exp $ */
+/* $OpenBSD: asm.h,v 1.13 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */
/*
@@ -74,11 +74,11 @@
# define _PROF_PROLOGUE
#endif
-#define ENTRY(y) _ENTRY(_C_LABEL(y)); _PROF_PROLOGUE
-#define ENTRY_NP(y) _ENTRY(_C_LABEL(y))
+#define ENTRY(y) _ENTRY(y); _PROF_PROLOGUE
+#define ENTRY_NP(y) _ENTRY(y)
#define ENTRY_NB(y) _ENTRY_NB(y); _PROF_PROLOGUE
-#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE
-#define ASENTRY_NP(y) _ENTRY(_ASM_LABEL(y))
+#define ASENTRY(y) _ENTRY(y); _PROF_PROLOGUE
+#define ASENTRY_NP(y) _ENTRY(y)
#define END(y) .size y, . - y
#if defined(__PIC__)
diff --git a/sys/arch/arm/include/frame.h b/sys/arch/arm/include/frame.h
index 4645031b40d..15abcba2b7f 100644
--- a/sys/arch/arm/include/frame.h
+++ b/sys/arch/arm/include/frame.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: frame.h,v 1.13 2018/06/30 15:23:37 deraadt Exp $ */
+/* $OpenBSD: frame.h,v 1.14 2022/12/08 01:25:44 guenther Exp $ */
/* $NetBSD: frame.h,v 1.9 2003/12/01 08:48:33 scw Exp $ */
/*
@@ -173,7 +173,7 @@ struct frame {
#define AST_LOCALS \
.Laflt_astpending: ;\
- .word _C_LABEL(astpending)
+ .word astpending
#define DO_AST \
ldr r0, [sp] /* Get the SPSR from stack */ ;\
@@ -193,7 +193,7 @@ struct frame {
msr cpsr_c, r4 /* Restore interrupts */ ;\
mov r0, sp ;\
adr lr, 1b ;\
- b _C_LABEL(ast) /* ast(frame) */ ;\
+ b ast /* ast(frame) */ ;\
2:
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 15:27:37 +0000