changes for pack labels; use cpp, now are *.c

[unix-history] / usr / src / sys / vax / mdec / upboot.c

diff --git a/usr/src/sys/vax/mdec/upboot.c b/usr/src/sys/vax/mdec/upboot.c
index 70e8a01..f088325 100644 (file)
--- a/usr/src/sys/vax/mdec/upboot.c
+++ b/usr/src/sys/vax/mdec/upboot.c
@@ -4,7 +4,8 @@
  * specifies the terms and conditions for redistribution.
  */
 
  * specifies the terms and conditions for redistribution.
  */
 

-/* "@(#)upboot.c       7.1 (Berkeley) %G%" */
+/* "@(#)upboot.c       7.2 (Berkeley) %G%" */
+#include <sys/disklabel.h>

 
        .set    MAJOR,2                 /* major("/dev/up0a") */
 
 
        .set    MAJOR,2                 /* major("/dev/up0a") */
 


@@ -54,10 +55,21 @@ init:
        bicw2   $0xf000,r5              /* remove from r5 */
        insv    r4,$8,$8,r10            /* set partition */
        movl    r5,r11                  /* boot flags */
        bicw2   $0xf000,r5              /* remove from r5 */
        insv    r4,$8,$8,r10            /* set partition */
        movl    r5,r11                  /* boot flags */

+
+       brw     start0
+
+/*
+ * Leave space for pack label.
+ */
+pad:
+       .space  LABELOFFSET - (pad - init)
+packlabel:
+       .space  d_end_
+
+start0:

        movl    physUBA[r9],r9          /* UNIBUS adaptor address */
        movl    r2,r8                   /* boot device CSR */
        movl    r3,r7                   /* unit number */
        movl    physUBA[r9],r9          /* UNIBUS adaptor address */
        movl    r2,r8                   /* boot device CSR */
        movl    r3,r7                   /* unit number */

-

        movl    $RELOC,sp
        moval   init,r4
        movc3   $end,(r4),(sp)
        movl    $RELOC,sp
        moval   init,r4
        movc3   $end,(r4),(sp)