removed printf.s

diff --git a/mach/m68k4/libem/LIST b/mach/m68k4/libem/LIST
index 72af3ed..d82cc1b 100644 (file)
--- a/mach/m68k4/libem/LIST
+++ b/mach/m68k4/libem/LIST
@@ -29,5 +29,4 @@ fat.s
 fakfp.s
 trp.s
 dia.s
-printf.s
 dvu.s

diff --git a/mach/m68k4/libem/dia.s b/mach/m68k4/libem/dia.s
index 94a078f..b6ae894 100644 (file)
--- a/mach/m68k4/libem/dia.s
+++ b/mach/m68k4/libem/dia.s
@@ -27,14 +27,97 @@ del = 0177
 2:
        move.l  d2,-(sp)
        pea     fmt
-       jsr     _printf
+       jsr     printf
        add     #12,sp
-       jmp     _printf
+       jmp     printf
 
 1:
        move.l  #unknwn,d2
        bra     2b
 
+.sect .bss
+getal:
+       .space  12
+char:
+       .space  1
+       .align  4
+.sect .data
+hexs:
+       .ascii  "0123456789abcdef"
+       .align  4
+.sect .text
+printf:
+       movem.l d0/d1/d2/a0/a1/a2/a3/a4/a5/a6, -(sp)
+       lea     44(sp), a6      ! a6 <- address of arguments
+       move.l  (a6)+, a5       ! a5 <- address of format
+next:  move.b  (a5)+, d0
+       beq     out
+       cmp.b   #'%', d0
+       beq     procnt
+put:   move.l  d0, -(sp)
+       jsr     putchar         ! long argument on stack
+       tst.l   (sp)+
+       bra     next
+
+procnt:        move.b  (a5)+, d0
+       cmp.b   #'d', d0        ! NOTE: %d means unsigned.
+       beq     digit
+       cmp.b   #'x', d0
+       beq     hex
+       cmp.b   #'s', d0
+       beq     string
+       cmp.b   #'%', d0        ! second % has to be printed.
+       beq     put
+       tst.b   -(a5)           ! normal char should be printed
+       bra     next
+
+string:        move.l  (a6)+, a2       ! a2 <- address of string
+sloop: move.b  (a2)+, d0
+       beq     next
+       move.l  d0, -(sp)
+       jsr     putchar         ! long argument on stack
+       tst.l   (sp)+
+       bra     sloop
+
+digit: move.l  (a6)+, d1       ! d1 <- integer
+       move.l  #getal+12, a2   ! a2 <- ptr to last part of buf
+       clr.b   -(a2)           ! stringterminator
+1:     
+       move.l  d1,-(sp)
+       move.l  #10,-(sp)
+       jsr     .dvu            ! d1 <- qotient; d0 <- remainder
+       add.l   #'0', d0
+       move.b  d0, -(a2)
+       tst.l   d1              ! if quotient = 0 then ready
+       bne     1b
+       bra     sloop           ! print digitstring.
+
+hex:   move.l  (a6)+, d1       ! d1 <- integer
+       move.l  #getal+12, a2   ! a2 <- ptr to last part of buf
+       clr.b   -(a2)           ! stringterminator
+       move.l  #7, d2          ! loop control
+1:     move.l  d1, d0
+       and.l   #15, d0
+       move.l  #hexs,a0
+       add.l   d0,a0
+       move.b  (a0), -(a2) ! hex digit
+       asr.l   #4, d1
+       dbf     d2, 1b
+       bra     sloop
+
+out:
+       movem.l (sp)+, d0/d1/d2/a0/a1/a2/a3/a4/a5/a6
+       rts
+
+
+putchar:
+       move.l  #1, -(sp)
+       pea     11(sp)
+       move.l  #1, -(sp)
+       jsr     _write
+       lea     12(sp), sp
+       rts
+.align 2
        .sect .data
 fmt:   .asciz "%s, line %d: "
 unknwn:        .asciz "unknown file"