Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/vax Move .s files to .S files. (and .s.o rules in b...
details: https://anonhg.NetBSD.org/src/rev/41ace68dbf0d
branches: trunk
changeset: 522677:41ace68dbf0d
user: matt <matt%NetBSD.org@localhost>
date: Sun Feb 24 01:04:23 2002 +0000
description:
Move .s files to .S files. (and .s.o rules in boot/Makefile.inc)
Put in register prefixes everywhere.
diffstat:
sys/arch/vax/boot/Makefile.inc | 6 +-
sys/arch/vax/boot/boot/Makefile | 7 +-
sys/arch/vax/boot/boot/autoconf.c | 8 +-
sys/arch/vax/boot/boot/consio2.S | 127 +++
sys/arch/vax/boot/boot/consio2.s | 127 ---
sys/arch/vax/boot/common/romread.S | 91 ++
sys/arch/vax/boot/common/romread.s | 91 --
sys/arch/vax/boot/common/srt0.S | 84 ++
sys/arch/vax/boot/common/srt0.s | 84 --
sys/arch/vax/boot/common/str.S | 164 +++++
sys/arch/vax/boot/common/str.s | 164 -----
sys/arch/vax/boot/xxboot/Makefile | 4 +-
sys/arch/vax/boot/xxboot/bootxx.c | 8 +-
sys/arch/vax/boot/xxboot/start.S | 242 +++++++
sys/arch/vax/boot/xxboot/start.s | 242 -------
sys/arch/vax/include/byte_swap.h | 6 +-
sys/arch/vax/include/macros.h | 100 ++-
sys/arch/vax/include/pmap.h | 20 +-
sys/arch/vax/include/profile.h | 6 +-
sys/arch/vax/vax/emulate.S | 1164 ++++++++++++++++++------------------
sys/arch/vax/vax/in4_cksum.c | 6 +-
sys/arch/vax/vax/intvec.S | 198 +++---
sys/arch/vax/vax/ka49.c | 2 +-
sys/arch/vax/vax/ka53.c | 4 +-
sys/arch/vax/vax/ka680.c | 4 +-
sys/arch/vax/vax/machdep.c | 35 +-
sys/arch/vax/vax/subr.S | 432 ++++++------
sys/arch/vax/vax/unimpl_emul.S | 626 +++++++++---------
28 files changed, 2051 insertions(+), 2001 deletions(-)
diffs (truncated from 5743 to 300 lines):
diff -r cb493470f0ee -r 41ace68dbf0d sys/arch/vax/boot/Makefile.inc
--- a/sys/arch/vax/boot/Makefile.inc Sun Feb 24 00:39:36 2002 +0000
+++ b/sys/arch/vax/boot/Makefile.inc Sun Feb 24 01:04:23 2002 +0000
@@ -1,11 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.5 2000/11/02 14:48:51 ragge Exp $
+# $NetBSD: Makefile.inc,v 1.6 2002/02/24 01:04:23 matt Exp $
RELOC=0x2f0000
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
CPPFLAGS+=-I. -I${.CURDIR}/../../../../ -I${.CURDIR}/../../ -I${.CURDIR}/../common -I${.CURDIR}/../../include
CPPFLAGS+=-DRELOC=${RELOC}
-
-# Private handling of assembler files.
-.s.o:
- ${CC} -x assembler-with-cpp ${CPPFLAGS} -E ${.IMPSRC} | ${AS} -o ${.TARGET}
diff -r cb493470f0ee -r 41ace68dbf0d sys/arch/vax/boot/boot/Makefile
--- a/sys/arch/vax/boot/boot/Makefile Sun Feb 24 00:39:36 2002 +0000
+++ b/sys/arch/vax/boot/boot/Makefile Sun Feb 24 01:04:23 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/02/24 00:17:42 matt Exp $
+# $NetBSD: Makefile,v 1.25 2002/02/24 01:04:24 matt Exp $
S= ${.CURDIR}/../../../..
NOMAN= # defined
@@ -8,9 +8,8 @@
PROG= boot
WARNS?= 1
DEVS= hp.c ctu.c ra.c mfm.c if_qe.c if_le.c if_ze.c if_de.c if_ni.c
-SRCS= srt0.s boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.s \
- urem.s udiv.s consio.c consio2.s str.s ${DEVS} findcpu.c \
- vers.c
+SRCS= srt0.S boot.c devopen.c conf.c autoconf.c netio.c rom.c romread.S \
+ consio.c consio2.S str.S ${DEVS} findcpu.c vers.c
CLEANFILES+=${PROG} ${PROG}.mop vers.c
CPPFLAGS+=-DSUPPORT_BOOTPARAMS -DSUPPORT_BOOTP -DSUPPORT_DHCP -D_STANDALONE \
diff -r cb493470f0ee -r 41ace68dbf0d sys/arch/vax/boot/boot/autoconf.c
--- a/sys/arch/vax/boot/boot/autoconf.c Sun Feb 24 00:39:36 2002 +0000
+++ b/sys/arch/vax/boot/boot/autoconf.c Sun Feb 24 01:04:23 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2000/07/19 00:58:24 matt Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2002/02/24 01:04:24 matt Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -216,9 +216,9 @@
" EIDSPTCH ":
" CMN_IDSPTCH ":
- movl (sp)+,r0
- pushl 4(r0)
- calls $1,*(r0)
+ movl (%sp)+,%r0
+ pushl 4(%r0)
+ calls $1,*(%r0)
popr $0x3f
rei
");
diff -r cb493470f0ee -r 41ace68dbf0d sys/arch/vax/boot/boot/consio2.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/vax/boot/boot/consio2.S Sun Feb 24 01:04:23 2002 +0000
@@ -0,0 +1,127 @@
+/* $NetBSD: consio2.S,v 1.1 2002/02/24 01:04:24 matt Exp $ */
+/*
+ * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed at Ludd, University of Lule}.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <machine/asm.h>
+
+/*
+ * int rom_putchar (int c) ==> putchar() using ROM-routines
+ */
+ENTRY(rom_putchar, 0x0004) # save-mask: R2
+ movl 4(%ap), %r2 # move argument to R2
+ jsb *_C_LABEL(rom_putc) # write it
+ ret # that is all
+
+
+/*
+ * int rom_getchar (void) ==> getchar() using ROM-routines
+ */
+ENTRY(rom_getchar, 0x0002) # save-mask: R1
+loop: # do {
+ jsb *_C_LABEL(rom_getc) # call the getc-routine
+ tstl %r0 # check if char ready
+ beql loop # } while (R0 == 0)
+ movl %r1, %r0 # R1 holds char
+ ret # we are done
+
+ENTRY(rom_testchar, 0)
+ mnegl $1,%r0
+ jsb *_C_LABEL(rom_getc)
+ tstl %r0
+ beql 1f
+ movl %r1,%r0
+1: ret
+
+ENTRY(_rtt, 0)
+ halt
+
+
+/*
+ * int ka630_rom_getchar (void) ==> getchar() using ROM-routines on KA630
+ */
+ENTRY(ka630_rom_getchar, 0x0802) # save-mask: R1, R11
+ movl _C_LABEL(ka630_conspage),%r11 # load location of console page
+1: # do {
+ jsb *0x1C(%r11) # call the getc-routine (KA630_GETC)
+ blbc %r0,1b # } while (R0 == 0)
+ movl %r1,%r0 # R1 holds char
+ ret # we are done
+
+ENTRY(ka630_rom_testchar, 0)
+ movl _C_LABEL(ka630_conspage),%r3
+ jsb *0x1C(%r3)
+ blbc %r0,1f
+ movl %r1,%r0
+1: ret
+
+/*
+ * int ka630_rom_putchar (int c) ==> putchar() using ROM-routines on KA630
+ */
+ENTRY(ka630_rom_putchar, 0x802) # save-mask: R1, R11
+ movl _C_LABEL(ka630_conspage),%r11
+ # load location of console page
+1: # do {
+ jsb *0x20(%r11) # is rom ready? (KA630_PUTC_POLL)
+ blbc %r0,1b # } while (R0 == 0)
+ movl 4(%ap),%r1 # R1 holds char
+ jsb *0x24(%r11) # output character (KA630_PUTC)
+ ret # we are done
+
+/*
+ * int ka53_rom_getchar (void) ==> getchar() using ROM-routines on KA53
+ */
+ENTRY(ka53_rom_getchar, 0x0802) # save-mask: R1, R11
+ movl _C_LABEL(ka53_conspage),%r11
+ # load location of console page
+1: # do {
+ jsb *0x64(%r11) # test for char
+ blbc %r0,1b # } while (R0 == 0)
+ jsb *0x6c(%r11) # get the char
+ ret # we are done
+
+ENTRY(ka53_rom_testchar, 0)
+ movl _C_LABEL(ka53_conspage),%r3
+ jsb *0x64(%r3)
+ blbc %r0,1f
+ jsb *0x6c(%r3) # get the char
+1: ret
+
+/*
+ * int ka53_rom_putchar (int c) ==> putchar() using ROM-routines on KA53
+ */
+ENTRY(ka53_rom_putchar, 0x0802) # save-mask: R1, R11
+ movl _C_LABEL(ka53_conspage),%r11
+ # load location of console page
+1: # do {
+ jsb *0x20(%r11) # is rom ready?
+ blbc %r0,1b # } whi le (R0 == 0)
+ movl 4(%ap),%r1 # R1 holds char
+ jsb *0x24(%r11) # output character
+ ret # we are done
diff -r cb493470f0ee -r 41ace68dbf0d sys/arch/vax/boot/boot/consio2.s
--- a/sys/arch/vax/boot/boot/consio2.s Sun Feb 24 00:39:36 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/* $NetBSD: consio2.s,v 1.1 2000/07/19 00:59:20 matt Exp $ */
-/*
- * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed at Ludd, University of Lule}.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <machine/asm.h>
-
-/*
- * int rom_putchar (int c) ==> putchar() using ROM-routines
- */
-ENTRY(rom_putchar, 0x0004) # save-mask: R2
- movl 4(ap), r2 # move argument to R2
- jsb *_C_LABEL(rom_putc) # write it
- ret # that is all
-
-
-/*
- * int rom_getchar (void) ==> getchar() using ROM-routines
- */
-ENTRY(rom_getchar, 0x0002) # save-mask: R1
-loop: # do {
- jsb *_C_LABEL(rom_getc) # call the getc-routine
- tstl r0 # check if char ready
- beql loop # } while (R0 == 0)
- movl r1, r0 # R1 holds char
- ret # we are done
-
-ENTRY(rom_testchar, 0)
- mnegl $1,r0
- jsb *_C_LABEL(rom_getc)
- tstl r0
- beql 1f
- movl r1,r0
-1: ret
-
-ENTRY(_rtt, 0)
- halt
-
-
-/*
- * int ka630_rom_getchar (void) ==> getchar() using ROM-routines on KA630
- */
-ENTRY(ka630_rom_getchar, 0x0802) # save-mask: R1, R11
- movl _C_LABEL(ka630_conspage),r11 # load location of console page
-1: # do {
- jsb *0x1C(r11) # call the getc-routine (KA630_GETC)
- blbc r0,1b # } while (R0 == 0)
- movl r1,r0 # R1 holds char
- ret # we are done
-
-ENTRY(ka630_rom_testchar, 0)
- movl _C_LABEL(ka630_conspage),r3
- jsb *0x1C(r3)
- blbc r0,1f
- movl r1,r0
-1: ret
-
-/*
- * int ka630_rom_putchar (int c) ==> putchar() using ROM-routines on KA630
- */
-ENTRY(ka630_rom_putchar, 0x802) # save-mask: R1, R11
- movl _C_LABEL(ka630_conspage),r11
- # load location of console page
-1: # do {
- jsb *0x20(r11) # is rom ready? (KA630_PUTC_POLL)
- blbc r0,1b # } while (R0 == 0)
- movl 4(ap),r1 # R1 holds char
- jsb *0x24(r11) # output character (KA630_PUTC)
- ret # we are done
-
-/*
- * int ka53_rom_getchar (void) ==> getchar() using ROM-routines on KA53
- */
-ENTRY(ka53_rom_getchar, 0x0802) # save-mask: R1, R11
- movl _C_LABEL(ka53_conspage),r11
- # load location of console page
-1: # do {
- jsb *0x64(r11) # test for char
- blbc r0,1b # } while (R0 == 0)
- jsb *0x6c(r11) # get the char
Home |
Main Index |
Thread Index |
Old Index