summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk4
-rw-r--r--sys/arch/sh/include/locore.h20
-rw-r--r--sys/arch/sh/sh/locore_subr.S166
3 files changed, 95 insertions, 95 deletions
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 66d591d16b1..61085ce65ff 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.36 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.landisk,v 1.37 2010/09/06 08:00:31 jsg Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -38,7 +38,7 @@ CMACHFLAGS+= -fno-stack-protector
COPTS?= -O2
CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
-AFLAGS= -D_LOCORE -x assembler-with-cpp -traditional-cpp ${CMACHFLAGS}
+AFLAGS= -D_LOCORE -x assembler-with-cpp ${CMACHFLAGS}
LINKFLAGS= -N -Ttext 0x8c002000 -e start --warn-common
.if ${IDENT:M-DDDB_STRUCT}
diff --git a/sys/arch/sh/include/locore.h b/sys/arch/sh/include/locore.h
index 13aa7bb7a64..75d278bd256 100644
--- a/sys/arch/sh/include/locore.h
+++ b/sys/arch/sh/include/locore.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore.h,v 1.4 2008/06/26 05:42:12 ray Exp $ */
+/* $OpenBSD: locore.h,v 1.5 2010/09/06 08:00:31 jsg Exp $ */
/* $NetBSD: locore.h,v 1.11 2006/01/23 22:32:50 uwe Exp $ */
/*-
@@ -28,17 +28,17 @@
*/
#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 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)
#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 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)
#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 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)
#endif /* SH3 && SH4 */
/*
diff --git a/sys/arch/sh/sh/locore_subr.S b/sys/arch/sh/sh/locore_subr.S
index aa073de2fd7..82d116362d0 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.9 2009/02/14 18:38:19 miod Exp $ */
+/* $OpenBSD: locore_subr.S,v 1.10 2010/09/06 08:00:31 jsg Exp $ */
/* $NetBSD: locore_subr.S,v 1.28 2006/01/23 22:52:09 uwe Exp $ */
/*
@@ -64,20 +64,20 @@
*/
#define SAVEPCB(reg) \
add #SF_SIZE, reg ; \
- sts.l mach, @-/**/reg ; \
- sts.l macl, @-/**/reg ; \
- stc.l r7_bank,@-/**/reg ; \
- stc.l sr, @-/**/reg ; \
- stc.l r6_bank,@-/**/reg ; \
- sts.l pr, @-/**/reg ; \
- mov.l r8, @-/**/reg ; \
- mov.l r9, @-/**/reg ; \
- mov.l r10, @-/**/reg ; \
- mov.l r11, @-/**/reg ; \
- mov.l r12, @-/**/reg ; \
- mov.l r13, @-/**/reg ; \
- mov.l r14, @-/**/reg ; \
- mov.l r15, @-/**/reg
+ sts.l mach, @-##reg ; \
+ sts.l macl, @-##reg ; \
+ stc.l r7_bank,@-##reg ; \
+ stc.l sr, @-##reg ; \
+ stc.l r6_bank,@-##reg ; \
+ sts.l pr, @-##reg ; \
+ mov.l r8, @-##reg ; \
+ mov.l r9, @-##reg ; \
+ mov.l r10, @-##reg ; \
+ mov.l r11, @-##reg ; \
+ mov.l r12, @-##reg ; \
+ mov.l r13, @-##reg ; \
+ mov.l r14, @-##reg ; \
+ mov.l r15, @-##reg
/*
* Save floating point registers to a fpreg structure.
@@ -88,43 +88,43 @@
sts fpscr, tmp2 ; \
add #(FP_SIZE - 124), reg ; \
mov #0, tmp; \
- mov.l tmp2, @-/**/reg ; \
+ mov.l tmp2, @-##reg ; \
lds tmp, fpscr; \
- sts.l fpul, @-/**/reg ; \
+ sts.l fpul, @-##reg ; \
frchg; \
- fmov.s fr15, @-/**/reg ; \
- fmov.s fr14, @-/**/reg ; \
- fmov.s fr13, @-/**/reg ; \
- fmov.s fr12, @-/**/reg ; \
- fmov.s fr11, @-/**/reg ; \
- fmov.s fr10, @-/**/reg ; \
- fmov.s fr9, @-/**/reg ; \
- fmov.s fr8, @-/**/reg ; \
- fmov.s fr7, @-/**/reg ; \
- fmov.s fr6, @-/**/reg ; \
- fmov.s fr5, @-/**/reg ; \
- fmov.s fr4, @-/**/reg ; \
- fmov.s fr3, @-/**/reg ; \
- fmov.s fr2, @-/**/reg ; \
- fmov.s fr1, @-/**/reg ; \
- fmov.s fr0, @-/**/reg ; \
+ fmov.s fr15, @-##reg ; \
+ fmov.s fr14, @-##reg ; \
+ fmov.s fr13, @-##reg ; \
+ fmov.s fr12, @-##reg ; \
+ fmov.s fr11, @-##reg ; \
+ fmov.s fr10, @-##reg ; \
+ fmov.s fr9, @-##reg ; \
+ fmov.s fr8, @-##reg ; \
+ fmov.s fr7, @-##reg ; \
+ fmov.s fr6, @-##reg ; \
+ fmov.s fr5, @-##reg ; \
+ fmov.s fr4, @-##reg ; \
+ fmov.s fr3, @-##reg ; \
+ fmov.s fr2, @-##reg ; \
+ fmov.s fr1, @-##reg ; \
+ fmov.s fr0, @-##reg ; \
frchg; \
- fmov.s fr15, @-/**/reg ; \
- fmov.s fr14, @-/**/reg ; \
- fmov.s fr13, @-/**/reg ; \
- fmov.s fr12, @-/**/reg ; \
- fmov.s fr11, @-/**/reg ; \
- fmov.s fr10, @-/**/reg ; \
- fmov.s fr9, @-/**/reg ; \
- fmov.s fr8, @-/**/reg ; \
- fmov.s fr7, @-/**/reg ; \
- fmov.s fr6, @-/**/reg ; \
- fmov.s fr5, @-/**/reg ; \
- fmov.s fr4, @-/**/reg ; \
- fmov.s fr3, @-/**/reg ; \
- fmov.s fr2, @-/**/reg ; \
- fmov.s fr1, @-/**/reg ; \
- fmov.s fr0, @-/**/reg ; \
+ fmov.s fr15, @-##reg ; \
+ fmov.s fr14, @-##reg ; \
+ fmov.s fr13, @-##reg ; \
+ fmov.s fr12, @-##reg ; \
+ fmov.s fr11, @-##reg ; \
+ fmov.s fr10, @-##reg ; \
+ fmov.s fr9, @-##reg ; \
+ fmov.s fr8, @-##reg ; \
+ fmov.s fr7, @-##reg ; \
+ fmov.s fr6, @-##reg ; \
+ fmov.s fr5, @-##reg ; \
+ fmov.s fr4, @-##reg ; \
+ fmov.s fr3, @-##reg ; \
+ fmov.s fr2, @-##reg ; \
+ fmov.s fr1, @-##reg ; \
+ fmov.s fr0, @-##reg ; \
lds tmp2, fpscr
/*
@@ -134,41 +134,41 @@
#define LOADFP(reg, tmp) \
mov #0, tmp; \
lds tmp, fpscr; \
- fmov.s @/**/reg/**/+, fr0 ; \
- fmov.s @/**/reg/**/+, fr1 ; \
- fmov.s @/**/reg/**/+, fr2 ; \
- fmov.s @/**/reg/**/+, fr3 ; \
- fmov.s @/**/reg/**/+, fr4 ; \
- fmov.s @/**/reg/**/+, fr5 ; \
- fmov.s @/**/reg/**/+, fr6 ; \
- fmov.s @/**/reg/**/+, fr7 ; \
- fmov.s @/**/reg/**/+, fr8 ; \
- fmov.s @/**/reg/**/+, fr9 ; \
- fmov.s @/**/reg/**/+, fr10 ; \
- fmov.s @/**/reg/**/+, fr11 ; \
- fmov.s @/**/reg/**/+, fr12 ; \
- fmov.s @/**/reg/**/+, fr13 ; \
- fmov.s @/**/reg/**/+, fr14 ; \
- fmov.s @/**/reg/**/+, fr15 ; \
+ fmov.s @##reg##+, fr0 ; \
+ fmov.s @##reg##+, fr1 ; \
+ fmov.s @##reg##+, fr2 ; \
+ fmov.s @##reg##+, fr3 ; \
+ fmov.s @##reg##+, fr4 ; \
+ fmov.s @##reg##+, fr5 ; \
+ fmov.s @##reg##+, fr6 ; \
+ fmov.s @##reg##+, fr7 ; \
+ fmov.s @##reg##+, fr8 ; \
+ fmov.s @##reg##+, fr9 ; \
+ fmov.s @##reg##+, fr10 ; \
+ fmov.s @##reg##+, fr11 ; \
+ fmov.s @##reg##+, fr12 ; \
+ fmov.s @##reg##+, fr13 ; \
+ fmov.s @##reg##+, fr14 ; \
+ fmov.s @##reg##+, fr15 ; \
frchg; \
- fmov.s @/**/reg/**/+, fr0 ; \
- fmov.s @/**/reg/**/+, fr1 ; \
- fmov.s @/**/reg/**/+, fr2 ; \
- fmov.s @/**/reg/**/+, fr3 ; \
- fmov.s @/**/reg/**/+, fr4 ; \
- fmov.s @/**/reg/**/+, fr5 ; \
- fmov.s @/**/reg/**/+, fr6 ; \
- fmov.s @/**/reg/**/+, fr7 ; \
- fmov.s @/**/reg/**/+, fr8 ; \
- fmov.s @/**/reg/**/+, fr9 ; \
- fmov.s @/**/reg/**/+, fr10 ; \
- fmov.s @/**/reg/**/+, fr11 ; \
- fmov.s @/**/reg/**/+, fr12 ; \
- fmov.s @/**/reg/**/+, fr13 ; \
- fmov.s @/**/reg/**/+, fr14 ; \
- fmov.s @/**/reg/**/+, fr15 ; \
- lds.l @/**/reg/**/+, fpul ; \
- lds.l @/**/reg/**/+, fpscr
+ fmov.s @##reg##+, fr0 ; \
+ fmov.s @##reg##+, fr1 ; \
+ fmov.s @##reg##+, fr2 ; \
+ fmov.s @##reg##+, fr3 ; \
+ fmov.s @##reg##+, fr4 ; \
+ fmov.s @##reg##+, fr5 ; \
+ fmov.s @##reg##+, fr6 ; \
+ fmov.s @##reg##+, fr7 ; \
+ fmov.s @##reg##+, fr8 ; \
+ fmov.s @##reg##+, fr9 ; \
+ fmov.s @##reg##+, fr10 ; \
+ fmov.s @##reg##+, fr11 ; \
+ fmov.s @##reg##+, fr12 ; \
+ fmov.s @##reg##+, fr13 ; \
+ fmov.s @##reg##+, fr14 ; \
+ fmov.s @##reg##+, fr15 ; \
+ lds.l @##reg##+, fpul ; \
+ lds.l @##reg##+, fpscr
.text
.align 5 /* align cache line size (32B) */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 21:47:37 +0000