Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/alpha/stand rename the C main() function to main_()...



details:   https://anonhg.NetBSD.org/src/rev/8655560d6d11
branches:  trunk
changeset: 467919:8655560d6d11
user:      cgd <cgd%NetBSD.org@localhost>
date:      Wed Mar 31 03:03:01 1999 +0000

description:
rename the C main() function to main_().  this avoids gcc's implicit
  call to __main(), and therefore saves the size of the call and the
  size of a stub implementation of __main().
in the primary boot block, don't bother saving/restoring the argument
  passed in from the caller.  There is no such argument (that we care
  about, at least) to the primary.  (for secondary, it's the firmware
  FD being used.)

diffstat:

 sys/arch/alpha/stand/bootxx/bootxx.c |   4 ++--
 sys/arch/alpha/stand/common/boot.c   |   4 ++--
 sys/arch/alpha/stand/common/start.S  |  16 +++++-----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diffs (81 lines):

diff -r 2a323c38b7e3 -r 8655560d6d11 sys/arch/alpha/stand/bootxx/bootxx.c
--- a/sys/arch/alpha/stand/bootxx/bootxx.c      Wed Mar 31 02:52:11 1999 +0000
+++ b/sys/arch/alpha/stand/bootxx/bootxx.c      Wed Mar 31 03:03:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.7 1999/03/27 09:01:27 ross Exp $ */
+/* $NetBSD: bootxx.c,v 1.8 1999/03/31 03:03:01 cgd Exp $ */
 
 /*
  * Copyright (C) 1998 by Ross Harvey
@@ -174,7 +174,7 @@
 }
 
 void
-main()
+main_()
 {
        int fd;
        char *loadaddr;
diff -r 2a323c38b7e3 -r 8655560d6d11 sys/arch/alpha/stand/common/boot.c
--- a/sys/arch/alpha/stand/common/boot.c        Wed Mar 31 02:52:11 1999 +0000
+++ b/sys/arch/alpha/stand/common/boot.c        Wed Mar 31 03:03:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.12 1999/03/27 09:01:28 ross Exp $ */
+/* $NetBSD: boot.c,v 1.13 1999/03/31 03:03:01 cgd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
 };
 
 void
-main(fd)
+main_(fd)
        int     fd;
 {
        char *name, **namep;
diff -r 2a323c38b7e3 -r 8655560d6d11 sys/arch/alpha/stand/common/start.S
--- a/sys/arch/alpha/stand/common/start.S       Wed Mar 31 02:52:11 1999 +0000
+++ b/sys/arch/alpha/stand/common/start.S       Wed Mar 31 03:03:01 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.5 1998/10/15 01:02:55 ross Exp $ */
+/* $NetBSD: start.S,v 1.6 1999/03/31 03:03:01 cgd Exp $ */
 
 /*  
  * Mach Operating System
@@ -51,17 +51,18 @@
 #ifndef PRIMARY_BOOTBLOCK
        lda     sp,start                /* start stack below text */
        lda     sp,-ENTRY_FRAME(sp)
-#endif
 
        or      a0,zero,s0
+#endif
        lda     a0,_edata
        lda     a1,_end
        subq    a1,a0,a1
        CALL(bzero)
+#ifndef PRIMARY_BOOTBLOCK
        or      s0,zero,a0
+#endif
 
-
-       CALL(main)                      /* transfer to C */
+       CALL(main_)                     /* transfer to C */
 
 XLEAF(_rtt, 0)
 XLEAF(halt, 0)
@@ -69,13 +70,6 @@
 END(start)
 
 /*
- * Dummy routine for GCC2.
- */
-LEAF(__main,0)
-       RET
-END(__main)
-
-/*
  * cpu_number
  *     Return the cpu number, using the whami instruction.
  */



Home | Main Index | Thread Index | Old Index