Manually apply "asxlat -u" to certain assembly files to fix local labels

diff --git a/usr/src/libc/stdio/doprnt.s b/usr/src/libc/stdio/doprnt.s
index b4f5e6e..4f6f82c 100644 (file)
--- a/usr/src/libc/stdio/doprnt.s
+++ b/usr/src/libc/stdio/doprnt.s
@@ -24,17 +24,17 @@ __doprnt:
 loop:
        mov     sp,r3
        mov     formp(r5),r1
-0$:
+_0:
        movb    (r1)+,r2
-       beq     1$
+       beq     _1
        cmp     r2,#'%
-       beq     1$
+       beq     _1
        movb    r2,(r3)+
-       br      0$
-1$:
+       br      _0
+_1:
        mov     r1,formp(r5)
        cmp     r3,sp
-       beq     2$
+       beq     _2
        mov     sp,r0
        mov     0o10(r5),-(sp)
        clr     -(sp)
@@ -43,42 +43,42 @@ loop:
        mov     r0,-(sp)
        jsr     pc,__strout
        add     #0o10,sp
-2$:
+_2:
        tst     r2
-       bne     3$
+       bne     _3
        jmp     cret
-3$:
+_3:
        mov     sp,r3
-4$:
+_4:
        clr     rjust(r5)
        clr     ndigit(r5)
        mov     #' ,zfill(r5)
        cmpb    *formp(r5),#'-
-       bne     5$
+       bne     _5
        inc     formp(r5)
        inc     rjust(r5)
-5$:
+_5:
        cmpb    *formp(r5),#'0
-       bne     6$
+       bne     _6
        mov     #'0,zfill(r5)
-6$:
+_6:
        jsr     r3,gnum
        mov     r1,width(r5)
        clr     ndfnd(r5)
        cmp     r0,#'.
-       bne     7$
+       bne     _7
        jsr     r3,gnum
        mov     r1,ndigit(r5)
-7$:
+_7:
        mov     #swtab,r1
-8$:
+_8:
        mov     (r1)+,r2
-       bne     9$
+       bne     _9
        movb    r0,(r3)+
        jmp     prbuf
-9$:
+_9:
        cmp     r0,(r1)+
-       bne     8$
+       bne     _8
        jmp     (r2)
        .area   data
 swtab:
@@ -140,51 +140,51 @@ longorunsg:
 
 octal:
        clr     r0
-       br      0$
+       br      _10
 loct:
        mov     (r4)+,r0
-0$:
+_10:
        mov     #8,r2
-       br      1$
+       br      _11
 
 hex:
        clr     r0
-       br      0$
+       br      _12
 
 lhex:
        mov     (r4)+,r0
-0$:
+_12:
        mov     #16,r2
-1$:
+_11:
        mov     (r4)+,r1
        br      compute
 
 decimal:
        mov     (r4)+,r1
        sxt     r0
-       bmi     0$
-       br      1$
+       bmi     _13
+       br      _14
 
 unsigned:
        clr     r0
-       br      0$
+       br      _15
 
 long:
        mov     (r4)+,r0
-       bge     0$
+       bge     _15
        mov     (r4)+,r1
-1$:
+_13:
        neg     r0
        neg     r1
        sbc     r0
        movb    #'-,(r3)+
-       br      2$
+       br      _14
 
 lunsigned:
        mov     (r4)+,r0
-0$:
+_15:
        mov     (r4)+,r1
-1$:
+_14:
        mov     #10,r2
 
 ;
@@ -197,48 +197,48 @@ compute:
        mov     ndigit(r5),r0
        mov     r1,r5
        ashc    #0,r4
-       beq     0$
+       beq     _16
        tst     r0
-       beq     0$
+       beq     _16
        movb    #'0,(r3)+
-0$:
-       jsr     pc,1$
+_16:
+       jsr     pc,_17
        mov     (sp)+,r4
        mov     (sp)+,r5
        br      prbuf
 
-1$:
+_17:
        clr     r0
        mov     r4,r1
-       beq     2$
+       beq     _18
        div     r2,r0
        mov     r0,r4
        mov     r1,r0
-2$:
+_18:
        mov     r5,r1
        asl     r2
        div     r2,r0
        asr     r2
        asl     r0
        cmp     r2,r1
-       bgt     3$
+       bgt     _19
        sub     r2,r1
        inc     r0
-3$:
+_19:
        mov     r1,-(sp)
        mov     r0,r5
-       bne     4$
+       bne     _20
        tst     r4
-       beq     5$
-4$:
-       jsr     pc,1$
-5$:
+       beq     _21
+_20:
+       jsr     pc,_17
+_21:
        mov     (sp)+,r0
        add     #'0,r0
        cmp     r0,#'9
-       ble     6$
+       ble     _22
        add     #'a-'0-10,r0
-6$:
+_22:
        movb    r0,(r3)+
        rts     pc
        
@@ -255,16 +255,16 @@ string:
        mov     ndigit(r5),r1
        mov     (r4),r2
        mov     r2,r3
-       bne     0$
+       bne     _23
        mov     #nulstr,r2
        mov     r2,r3
        mov     r2,(r4)
-0$:
+_23:
        tstb    (r2)+
-       beq     1$
+       beq     _24
        inc     r3
-       sob     r1,0$
-1$:
+       sob     r1,_23
+_24:
        mov     (r4)+,r2
        br      prstr
 
@@ -278,9 +278,9 @@ scien:
        mov     ndigit(r5),r0
        inc     r0
        tst     ndfnd(r5)
-       bne     0$
+       bne     _25
        mov     #7,r0
-0$:
+_25:
        mov     pc,r2
        jsr     pc,pscien
        br      prbuf
@@ -296,13 +296,13 @@ prstr:
        sub     r2,r3
        mov     width(r5),r1
        sub     r3,r1
-       bge     0$
+       bge     _26
        clr     r1
-0$:
+_26:
        tst     rjust(r5)
-       bne     1$
+       bne     _27
        neg     r1
-1$:
+_27:
        mov     zfill(r5),-(sp)
        mov     0o10(r5),-(sp)
        mov     r1,-(sp)
@@ -315,23 +315,23 @@ prstr:
 gnum:
        clr     ndfnd(r5)
        clr     r1
-0$:
+_28:
        movb    *formp(r5),r0
        inc     formp(r5)
        sub     #'0,r0
        cmp     r0,#'*-'0
-       bne     1$
+       bne     _29
        mov     (r4)+,r0
-       br      2$
-1$:
+       br      _30
+_29:
        cmp     r0,#9
-       bhi     3$
-2$:
+       bhi     _31
+_30:
        inc     ndfnd(r5)
        mul     #10,r1
        add     r0,r1
-       br      0$
-3$:
+       br      _28
+_31:
        add     #'0,r0
        rts     r3
 

diff --git a/usr/src/libc/sys/dup.s b/usr/src/libc/sys/dup.s
index 850f526..d29f6e3 100644 (file)
--- a/usr/src/libc/sys/dup.s
+++ b/usr/src/libc/sys/dup.s
@@ -12,17 +12,17 @@ _dup2:
        mov     sp,r5
        mov     4(r5),r0
        bis     #0o100,r0
-       br      0$
+       br      _0
 
 _dup:
        mov     r5,-(sp)
        mov     sp,r5
        mov     4(r5),r0
-0$:
+_0:
        mov     6(r5),r1
        sys     .dup
-       bec     1$
+       bec     _1
        jmp     cerror
-1$:
+_1:
        mov     (sp)+,r5
        rts     pc

diff --git a/usr/src/libc/sys/mpxcall.s b/usr/src/libc/sys/mpxcall.s
index bba5803..cec7925 100644 (file)
--- a/usr/src/libc/sys/mpxcall.s
+++ b/usr/src/libc/sys/mpxcall.s
@@ -3,19 +3,19 @@
 _mpxcall:
        mov     r5,-(sp)
        mov     sp,r5
-       mov     4(r5),0$
-       mov     6(r5),0$+2
+       mov     4(r5),_0
+       mov     6(r5),_0+2
 call:
        sys     0
-.dw    0$
-       bec     1$
+.dw    _1
+       bec     _2
        jmp     cerror
-1$:
+_2:
        mov     (sp)+,r5
        rts     pc
 .area  data
-0$:
+_1:
        sys     56
-2$:.dw 0 ;..
+_0:.dw 0 ;..
 .dw    0 ;..
 

diff --git a/usr/src/libc/sys/sbrk.s b/usr/src/libc/sys/sbrk.s
index 0c81803..82310ed 100644 (file)
--- a/usr/src/libc/sys/sbrk.s
+++ b/usr/src/libc/sys/sbrk.s
@@ -10,14 +10,14 @@
 _sbrk:
        mov     r5,-(sp)
        mov     sp,r5
-       mov     4(r5),0$
-       beq     1$
-       add     nd,0$
+       mov     4(r5),_0
+       beq     _1
+       add     nd,_0
        sys     0
-.dw    2$
-       bec     1$
+.dw    _2
+       bec     _1
        jmp     cerror
-1$:
+_1:
        mov     nd,r0
        add     4(r5),nd
        mov     (sp)+,r5
@@ -30,19 +30,19 @@ _sbrk:
 _brk:
        mov     r5,-(sp)
        mov     sp,r5
-       mov     4(r5),0$
+       mov     4(r5),_0
        sys     0
-.dw    1$
-       bec     2$
+.dw    _2
+       bec     _3
        jmp     cerror
-2$:
+_3:
        mov     4(r5),nd
        clr     r0
        mov     (sp)+,r5
        rts     pc
 
 .area  data
-1$:
+_2:
        sys     .break
-0$:.dw 0 ;..
+_0:.dw 0 ;..
 nd:    .dw     _end

diff --git a/usr/src/libc/sys/signal.s b/usr/src/libc/sys/signal.s
index ad6a98c..404bc0a 100644 (file)
--- a/usr/src/libc/sys/signal.s
+++ b/usr/src/libc/sys/signal.s
@@ -14,79 +14,79 @@ _signal:
        mov     sp,r5
        mov     4(r5),r1
        cmp     r1,#NSIG
-       bhis    0$
+       bhis    _0
        mov     6(r5),r0
-       mov     r1,1$
+       mov     r1,_1
        asl     r1
        mov     dvect(r1),-(sp)
        mov     r0,dvect(r1)
-       mov     r0,1$+2
-       beq     2$
+       mov     r0,_1+2
+       beq     _2
        bit     #1,r0
-       bne     2$
+       bne     _2
        asl     r1
        add     #tvect,r1
-       mov     r1,1$+2
-2$:
+       mov     r1,_1+2
+_2:
        sys     0
-.dw    3$
-       bes     4$
+.dw    _3
+       bes     _4
        bit     #1,r0
-       beq     5$
+       beq     _5
        mov     r0,(sp)
-5$:
+_5:
        mov     (sp)+,r0
        mov     (sp)+,r5
        rts     pc
-0$:
+_0:
        mov     #22,r0          ; EINVAL
-4$:
+_4:
        jmp     cerror
 
 NSIG = 0
 tvect:
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
-       jsr     r0,0$
+       jsr     r0,_6
 NSIG=NSIG+1
 
-0$:
+_6:
        mov     r1,-(sp)
        mov     r2,-(sp)
        mov     r3,-(sp)
@@ -104,9 +104,9 @@ NSIG=NSIG+1
        mov     (sp)+,r0
        rtt
 .area  data
-1$:
+_3:
        sys     .signal
-2$:.dw 0 ;..
+_1:.dw 0 ;..
 .dw    0 ;..
 .area  bss
 dvect: .ds     40