diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/landisk/landisk/locore0.S | 6 | ||||
| -rw-r--r-- | sys/arch/landisk/stand/boot/srt0.S | 4 | ||||
| -rw-r--r-- | sys/arch/landisk/stand/mbr/mbr.S | 12 | ||||
| -rw-r--r-- | sys/arch/landisk/stand/xxboot/pbr.S | 18 | ||||
| -rw-r--r-- | sys/arch/landisk/stand/xxboot/xxboot.S | 4 | ||||
| -rw-r--r-- | sys/arch/sh/include/asm.h | 26 | ||||
| -rw-r--r-- | sys/arch/sh/include/locore.h | 10 | ||||
| -rw-r--r-- | sys/arch/sh/sh/locore_subr.S | 30 | ||||
| -rw-r--r-- | sys/arch/sh/sh/vectors.S | 38 |
9 files changed, 74 insertions, 74 deletions
diff --git a/sys/arch/landisk/landisk/locore0.S b/sys/arch/landisk/landisk/locore0.S index 29d710d648d..f651286669c 100644 --- a/sys/arch/landisk/landisk/locore0.S +++ b/sys/arch/landisk/landisk/locore0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore0.S,v 1.1 2017/06/08 05:35:25 deraadt Exp $ */ +/* $OpenBSD: locore0.S,v 1.2 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: locore.S,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -67,6 +67,6 @@ ALTENTRY(kernel_text) /* NOTREACHED */ .align 2 -_L.landisk_startup: .long _C_LABEL(landisk_startup) -_L.bootstrap_stack: .long _C_LABEL(start) +_L.landisk_startup: .long landisk_startup +_L.bootstrap_stack: .long start _L.MMUCR: .long SH4_MMUCR diff --git a/sys/arch/landisk/stand/boot/srt0.S b/sys/arch/landisk/stand/boot/srt0.S index 8c3b42c05e3..678c0d1ec7c 100644 --- a/sys/arch/landisk/stand/boot/srt0.S +++ b/sys/arch/landisk/stand/boot/srt0.S @@ -1,4 +1,4 @@ -/* $OpenBSD: srt0.S,v 1.5 2022/09/02 10:15:35 miod Exp $ */ +/* $OpenBSD: srt0.S,v 1.6 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: boot.S,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -148,7 +148,7 @@ ENTRY(cache_disable) .L.__bss_start: .long __bss_start .L.boot: - .long _C_LABEL(boot) + .long boot .L.start: .long 0xc0000000 .L.pwrctl: diff --git a/sys/arch/landisk/stand/mbr/mbr.S b/sys/arch/landisk/stand/mbr/mbr.S index 4e5d1b6b8c4..c2727aaa6ff 100644 --- a/sys/arch/landisk/stand/mbr/mbr.S +++ b/sys/arch/landisk/stand/mbr/mbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: mbr.S,v 1.2 2022/05/24 17:29:02 krw Exp $ */ +/* $OpenBSD: mbr.S,v 1.3 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: mbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ /*- @@ -159,7 +159,7 @@ boot_lba: .align 1 -mbr_size: .word mbr_end - _C_LABEL(start) +mbr_size: .word mbr_end - start .align 1 stack_offset: .word 0x1000 .align 1 @@ -182,17 +182,17 @@ ERR_NOOS: .asciz "No O/S\r\n" /* space for mbr_dsn */ - . = _C_LABEL(start) + 0x1b4 + . = start + 0x1b4 .long 0 /* mbr_bootsel_magic */ - . = _C_LABEL(start) + 0x1b8 + . = start + 0x1b8 .word 0 /* * MBR partition table */ - . = _C_LABEL(start) + 0x1be + . = start + 0x1be _pbr_part0: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 @@ -206,7 +206,7 @@ _pbr_part3: .byte 0, 0, 0, 0, 0, 0, 0, 0 .byte 0, 0, 0, 0, 0, 0, 0, 0 - . = _C_LABEL(start) + 0x1fe + . = start + 0x1fe magic: .word 0xaa55 mbr_end: diff --git a/sys/arch/landisk/stand/xxboot/pbr.S b/sys/arch/landisk/stand/xxboot/pbr.S index 8a101f3d9e6..476050148dc 100644 --- a/sys/arch/landisk/stand/xxboot/pbr.S +++ b/sys/arch/landisk/stand/xxboot/pbr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: pbr.S,v 1.2 2022/08/24 17:35:15 miod Exp $ */ +/* $OpenBSD: pbr.S,v 1.3 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: pbr.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ /*- @@ -40,9 +40,9 @@ ENTRY(start) .byte 0x11 /* 0x4f11: cmp/pz r15... */ .asciz "OpenBSD" - . = _C_LABEL(start) + 0x0b /* move to start of BPB */ + . = start + 0x0b /* move to start of BPB */ - . = _C_LABEL(start) + 0x1c /* skip BPB */ + . = start + 0x1c /* skip BPB */ start0: mova pbr_end, r0 mov.w pbr_size, r2 @@ -175,7 +175,7 @@ pbr_read_ok: .align 1 -pbr_size: .word pbr_end - _C_LABEL(start) +pbr_size: .word pbr_end - start .align 1 stack_offset: .word 0x1000 .align 1 @@ -187,9 +187,9 @@ magic_offset: .word 0x1fe .L.xxboot_magic1: .long 0x20031125 .L.xxboot_magic: - .long _C_LABEL(xxboot_magic) + .long xxboot_magic .L.xxboot_start: - .long _C_LABEL(xxboot_start) + .long xxboot_start .align 2 crlf: .asciz "\r\n" @@ -202,11 +202,11 @@ ERR_NO_XXBOOT: .asciz "Not a xxboot image" ERR_PTN: .asciz "No OpenBSD partition" - . = _C_LABEL(start) + 0x1fe + . = start + 0x1fe magic: .word 0xaa55 pbr_end: - .global _C_LABEL(ptn_disklabel) -_C_LABEL(ptn_disklabel): + .global ptn_disklabel +ptn_disklabel: .fill 512 diff --git a/sys/arch/landisk/stand/xxboot/xxboot.S b/sys/arch/landisk/stand/xxboot/xxboot.S index c8c0e4cece5..a88209a90d1 100644 --- a/sys/arch/landisk/stand/xxboot/xxboot.S +++ b/sys/arch/landisk/stand/xxboot/xxboot.S @@ -1,4 +1,4 @@ -/* $OpenBSD: xxboot.S,v 1.1 2006/11/08 17:46:56 deraadt Exp $ */ +/* $OpenBSD: xxboot.S,v 1.2 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: xxboot.S,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ /*- @@ -93,7 +93,7 @@ boot_fail: .L.__bss_start: .long __bss_start .L.boot1: - .long _C_LABEL(boot1) + .long boot1 .L.2nd_loadaddr: .long LOADADDRESS .L.boot_params: diff --git a/sys/arch/sh/include/asm.h b/sys/arch/sh/include/asm.h index 6192b76db5e..6e0c6a4f362 100644 --- a/sys/arch/sh/include/asm.h +++ b/sys/arch/sh/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.9 2022/08/30 16:26:29 miod Exp $ */ +/* $OpenBSD: asm.h,v 1.10 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: asm.h,v 1.25 2006/01/20 22:02:40 christos Exp $ */ /*- @@ -74,22 +74,22 @@ #define _PROF_PROLOGUE #endif /* !GPROF */ -#define ENTRY(y) _ENTRY(_C_LABEL(y)) _PROF_PROLOGUE -#define NENTRY(y) _ENTRY(_C_LABEL(y)) -#define ASENTRY(y) _ENTRY(_ASM_LABEL(y)) _PROF_PROLOGUE +#define ENTRY(y) _ENTRY(y) _PROF_PROLOGUE +#define NENTRY(y) _ENTRY(y) +#define ASENTRY(y) _ENTRY(y) _PROF_PROLOGUE #define END(y) .size y, . - y #define SET_ENTRY_SIZE(y) \ - .size _C_LABEL(y), . - _C_LABEL(y) + .size y, . - y #define SET_ASENTRY_SIZE(y) \ - .size _ASM_LABEL(y), . - _ASM_LABEL(y) + .size y, . - y #define ALTENTRY(name) \ - .globl _C_LABEL(name) ;\ - .type _C_LABEL(name),@function ;\ - _C_LABEL(name): + .globl name ;\ + .type name,@function ;\ + name: /* * Hide the gory details of PIC calls vs. normal calls. Use as in the @@ -182,10 +182,10 @@ #endif /* !PIC */ #define STRONG_ALIAS(alias,sym) \ - .global _C_LABEL(alias); \ - _C_LABEL(alias) = _C_LABEL(sym) + .global alias; \ + alias = sym #define WEAK_ALIAS(alias,sym) \ - .weak _C_LABEL(alias); \ - _C_LABEL(alias) = _C_LABEL(sym) + .weak alias; \ + alias = sym #endif /* !_SH_ASM_H_ */ diff --git a/sys/arch/sh/include/locore.h b/sys/arch/sh/include/locore.h index 3fb058e3042..95375f957bb 100644 --- a/sys/arch/sh/include/locore.h +++ b/sys/arch/sh/include/locore.h @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.h,v 1.6 2016/05/18 20:21:13 guenther Exp $ */ +/* $OpenBSD: locore.h,v 1.7 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: locore.h,v 1.11 2006/01/23 22:32:50 uwe Exp $ */ /*- @@ -29,16 +29,16 @@ #if defined(SH3) && defined(SH4) #define MOV(x, r) mov.l .L_##x, r; mov.l @r, r -#define REG_SYMBOL(x) .L_##x: .long _C_LABEL(__sh_##x) -#define FUNC_SYMBOL(x) .L_##x: .long _C_LABEL(__sh_##x) +#define REG_SYMBOL(x) .L_##x: .long __sh_##x +#define FUNC_SYMBOL(x) .L_##x: .long __sh_##x #elif defined(SH3) #define MOV(x, r) mov.l .L_##x, r #define REG_SYMBOL(x) .L_##x: .long SH3_##x -#define FUNC_SYMBOL(x) .L_##x: .long _C_LABEL(sh3_##x) +#define FUNC_SYMBOL(x) .L_##x: .long sh3_##x #elif defined(SH4) #define MOV(x, r) mov.l .L_##x, r #define REG_SYMBOL(x) .L_##x: .long SH4_##x -#define FUNC_SYMBOL(x) .L_##x: .long _C_LABEL(sh4_##x) +#define FUNC_SYMBOL(x) .L_##x: .long sh4_##x #endif /* SH3 && SH4 */ /* diff --git a/sys/arch/sh/sh/locore_subr.S b/sys/arch/sh/sh/locore_subr.S index 5f524e77d93..b4691cfe87b 100644 --- a/sys/arch/sh/sh/locore_subr.S +++ b/sys/arch/sh/sh/locore_subr.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore_subr.S,v 1.13 2022/01/02 06:16:08 jsg Exp $ */ +/* $OpenBSD: locore_subr.S,v 1.14 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: locore_subr.S,v 1.28 2006/01/23 22:52:09 uwe Exp $ */ /* @@ -240,7 +240,7 @@ ENTRY(cpu_switchto) nop .align 2 .L_SF: .long (P_MD_PCB) -.L_cpu_switch_prepare: .long _C_LABEL(cpu_switch_prepare) +.L_cpu_switch_prepare: .long cpu_switch_prepare FUNC_SYMBOL(switch_resume) #ifdef SH3 @@ -263,7 +263,7 @@ NENTRY(sh3_switch_resume) mov.l r0, @r1 .align 2 .L_UPTE: .long P_MD_UPTE -.L_curupte: .long _C_LABEL(curupte) +.L_curupte: .long curupte SET_ENTRY_SIZE(sh3_switch_resume) #endif /* SH3 */ @@ -493,8 +493,8 @@ NENTRY(sigcode) mov r15, r4 /* get pointer to sigcontext */ mov.l .L_SYS_sigreturn, r0 trapa #0x80 /* and call sigreturn() */ - .globl _C_LABEL(sigcoderet) -_C_LABEL(sigcoderet): + .globl sigcoderet +sigcoderet: mov.l .L_SYS_exit, r0 trapa #0x80 /* exit if sigreturn fails */ /* NOTREACHED */ @@ -504,8 +504,8 @@ _C_LABEL(sigcoderet): .L_SYS_exit: .long SYS_exit /* LINTSTUB: Var: char esigcode[1] */ -.globl _C_LABEL(esigcode) -_C_LABEL(esigcode): +.globl esigcode +esigcode: SET_ENTRY_SIZE(sigcode) .globl sigfill @@ -604,9 +604,9 @@ ENTRY(copyout) .L_copyout_VM_MAXUSER_ADDRESS: .long VM_MAXUSER_ADDRESS .L_copyout_curpcb: - .long _C_LABEL(curpcb) + .long curpcb .L_copyout_memcpy: - .long _C_LABEL(memcpy) + .long memcpy SET_ENTRY_SIZE(copyout) @@ -660,9 +660,9 @@ ENTRY(copyin) .L_copyin_VM_MAXUSER_ADDRESS: .long VM_MAXUSER_ADDRESS .L_copyin_curpcb: - .long _C_LABEL(curpcb) + .long curpcb .L_copyin_memcpy: - .long _C_LABEL(memcpy) + .long memcpy SET_ENTRY_SIZE(copyin) @@ -738,7 +738,7 @@ ENTRY(copyoutstr) .L_copyoutstr_VM_MAXUSER_ADDRESS: .long VM_MAXUSER_ADDRESS .L_copyoutstr_curpcb: - .long _C_LABEL(curpcb) + .long curpcb SET_ENTRY_SIZE(copyoutstr) @@ -814,7 +814,7 @@ ENTRY(copyinstr) .L_copyinstr_VM_MAXUSER_ADDRESS: .long VM_MAXUSER_ADDRESS .L_copyinstr_curpcb: - .long _C_LABEL(curpcb) + .long curpcb SET_ENTRY_SIZE(copyinstr) /* @@ -856,9 +856,9 @@ ENTRY(kcopy) .L_kcopy_onfault: .long 2b .L_kcopy_curpcb: - .long _C_LABEL(curpcb) + .long curpcb .L_kcopy_memcpy: - .long _C_LABEL(memcpy) + .long memcpy SET_ENTRY_SIZE(kcopy) diff --git a/sys/arch/sh/sh/vectors.S b/sys/arch/sh/sh/vectors.S index bb11814c90f..5c19b44a0ea 100644 --- a/sys/arch/sh/sh/vectors.S +++ b/sys/arch/sh/sh/vectors.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vectors.S,v 1.8 2010/12/14 20:24:25 jasper Exp $ */ +/* $OpenBSD: vectors.S,v 1.9 2022/12/08 02:11:27 guenther Exp $ */ /* $NetBSD: exception_vector.S,v 1.19 2006/08/22 21:47:57 uwe Exp $ */ /*- @@ -54,8 +54,8 @@ */ #define VECTOR_END_MARKER(sym) \ - .globl _C_LABEL(sym); \ - _C_LABEL(sym): + .globl sym; \ + sym: /* @@ -120,13 +120,13 @@ NENTRY(sh_vector_generic) 2: __EXCEPTION_RETURN /* NOTREACHED */ .align 5 -.Lg_curproc: .long _C_LABEL(cpu_info_store) + CI_CURPROC +.Lg_curproc: .long cpu_info_store + CI_CURPROC REG_SYMBOL(EXPEVT) REG_SYMBOL(BBRA) REG_SYMBOL(TEA) -.Lg_tlb_exception: .long _C_LABEL(tlb_exception) -.Lg_general_exception: .long _C_LABEL(general_exception) -.Lg_ast: .long _C_LABEL(ast) +.Lg_tlb_exception: .long tlb_exception +.Lg_general_exception: .long general_exception +.Lg_ast: .long ast .Lg_TLB_PROT_ST: .long EXPEVT_TLB_PROT_ST .Lg_VPN_MASK: .long 0xfffff000 @@ -281,8 +281,8 @@ NENTRY(sh3_vector_tlbmiss) .align 4 .L3_VPN_cleanup: .long ~0x00000c00 -.L3_curptd: .long _C_LABEL(curptd) -.L3_kernptd: .long _C_LABEL(__pmap_kernel) +.L3_curptd: .long curptd +.L3_kernptd: .long __pmap_kernel .L3_VM_MIN_KERNEL_ADDRESS: .long VM_MIN_KERNEL_ADDRESS .L3_ptp_index_mask: .long 0x1ff .L3_ptp_offset_mask: .long 0x3ff << 2 @@ -290,8 +290,8 @@ NENTRY(sh3_vector_tlbmiss) .L3_PG_V: .long PG_V .L3_clear_ASID: .long ~SH3_PTEH_ASID_MASK .L3_SH3_EXPEVT: .long SH3_EXPEVT -.L3_curproc: .long _C_LABEL(cpu_info_store) + CI_CURPROC -.L3_tlb_exception: .long _C_LABEL(tlb_exception) +.L3_curproc: .long cpu_info_store + CI_CURPROC +.L3_tlb_exception: .long tlb_exception /* LINTSTUB: Var: char sh3_vector_tlbmiss_end[1]; */ VECTOR_END_MARKER(sh3_vector_tlbmiss_end) @@ -447,16 +447,16 @@ NENTRY(sh4_vector_tlbmiss) .L4_SH4_PTEH: .long SH4_PTEH .L4_VPN_cleanup: .long ~0x00000c00 -.L4_curptd: .long _C_LABEL(curptd) -.L4_kernptd: .long _C_LABEL(__pmap_kernel) +.L4_curptd: .long curptd +.L4_kernptd: .long __pmap_kernel .L4_VM_MIN_KERNEL_ADDRESS: .long VM_MIN_KERNEL_ADDRESS .L4_ptp_index_mask: .long 0x1ff .L4_ptp_offset_mask: .long 0x3ff << 2 .L4_PG_HW_BITS: .long PG_HW_BITS .L4_PG_V: .long PG_V .L4_clear_ASID: .long ~SH4_PTEH_ASID_MASK -.L4_curproc: .long _C_LABEL(cpu_info_store) + CI_CURPROC -.L4_tlb_exception: .long _C_LABEL(tlb_exception) +.L4_curproc: .long cpu_info_store + CI_CURPROC +.L4_tlb_exception: .long tlb_exception /* LINTSTUB: Var: char sh4_vector_tlbmiss_end[1]; */ @@ -497,10 +497,10 @@ NENTRY(sh_vector_interrupt) __EXCEPTION_RETURN .align 5 -.Li_curproc: .long _C_LABEL(cpu_info_store) + CI_CURPROC -.Li_intc_intr: .long _C_LABEL(intc_intr) -.Li_ast: .long _C_LABEL(ast) -.Li_uvmexp_intrs: .long _C_LABEL(uvmexp) + UVMEXP_INTRS +.Li_curproc: .long cpu_info_store + CI_CURPROC +.Li_intc_intr: .long intc_intr +.Li_ast: .long ast +.Li_uvmexp_intrs: .long uvmexp + UVMEXP_INTRS /* LINTSTUB: Var: char sh_vector_interrupt_end[1]; */ VECTOR_END_MARKER(sh_vector_interrupt_end) |