Skip to content

Commit b021d70

Browse files
committed
[xaudio] fix debug output
1 parent 9e10b04 commit b021d70

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

xaudio/src/kprintf.i

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,11 @@ _kprintf: movem.l d0-d1/a0-a3/a6,-(sp)
6868
movem.l (sp)+,d0-d1/a0-a3/a6
6969
rts
7070

71-
.putch: move.l a3,a6
72-
jmp -516(a6) ; _LVORawPutChar (execPrivate9)
71+
.putch: move.l a6,-(sp)
72+
move.l a3,a6
73+
jsr -516(a6) ; _LVORawPutChar (execPrivate9)
74+
move.l (sp)+,a6
75+
rts
7376
_kprintf_end:
7477
ENDC
7578

xaudio/src/replay_audio.s

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ VERSTAG MACRO
9090
include kprintf.i
9191

9292
*************************************************************************
93-
93+
NOLIST
9494
incdir include:
9595
incdir sys:code/ndk_3.9/include/include_i/
9696

@@ -106,6 +106,7 @@ VERSTAG MACRO
106106
include lvo/exec_lib.i
107107
include lvo/expansion_lib.i
108108
include lvo/timer_lib.i
109+
LIST
109110

110111
*************************************************************************
111112

@@ -802,6 +803,7 @@ RomTag:
802803
; in D0. The segment list is in A0. If it returns non-zero then the library will be
803804
; linked into the library list.
804805
.initRoutine: ; ( libptr:d0 seglist:a0 )
806+
kprintf "replay.audio/initRoutine"
805807
movem.l d1/a0/a1/a5/a6,-(sp)
806808

807809
move.l d0,a5
@@ -883,7 +885,6 @@ GetBoardAddr: ; ( exec:a6 )
883885
SetMMU ; ( addr:a0 size:d0 flags:d1 exec:a6 )
884886
; returns old flags in d0/d1
885887
; ( d0-d1/a0-a1 are scratch )
886-
kprintf "SetMMU %lx %lx %lx (exec = %lx)",a0,d0,d1,a6
887888

888889
MAPP_CACHEINHIBIT equ (1<<6)
889890
MAPP_COPYBACK equ (1<<13)
@@ -906,6 +907,8 @@ _LVOUnlockContextList EQU -216
906907
_LVOSetPropertyList EQU -228
907908
_LVORebuildTreesA EQU -360
908909

910+
kprintf "SetMMU(addr:%lx size:%lx flags:%lx)",a0,d0,d1
911+
909912
movem.l d2-d7/a2-a5,-(sp)
910913

911914
movem.l d0/a0,-(sp) ; (sp),4(sp) = size,addr
@@ -927,6 +930,7 @@ _LVORebuildTreesA EQU -360
927930
tst.b d0
928931
bne.b .mmu_ok
929932

933+
kprintf "GetMMUType = <none>"
930934
pea .nommu(pc)
931935
bra .failed
932936

@@ -1128,6 +1132,7 @@ _LVORebuildTreesA EQU -360
11281132
; then null is returned. It might fail if we allocated memory on each open, or if only
11291133
; open application could have the library open at a time...
11301134
LIB_Open: ; ( libptr:a6, version:d0 ; returns libptr:d0, if successful)
1135+
kprintf "replay.audio/LIB_Open"
11311136
addq.w #1,LIB_OPENCNT(a6)
11321137
bclr.b #LIBB_DELEXP,rb_Flags(a6)
11331138
move.l a6,d0
@@ -1138,6 +1143,7 @@ LIB_Open: ; ( libptr:a6, version:d0 ; returns libptr:d0, if successful)
11381143
; segment list (as given to Init). Otherwise close should return NULL.
11391144

11401145
LIB_Close: ; ( libptr:a6 ; returns 0:d0 or seglist:d0 )
1146+
kprintf "replay.audio/LIB_Close"
11411147
moveq #0,d0
11421148
subq.w #1,LIB_OPENCNT(a6)
11431149
bne.b .exit
@@ -1155,6 +1161,7 @@ LIB_Close: ; ( libptr:a6 ; returns 0:d0 or seglist:d0 )
11551161
; NEVER Wait() or otherwise take long time to complete.
11561162

11571163
LIB_Expunge: ; ( libptr: a6 ; returns 0:d0 or seglist:d0 )
1164+
kprintf "replay.audio/LIB_Expunge"
11581165
movem.l d1/d2/a0/a1/a5/a6,-(sp)
11591166
move.l a6,a5
11601167
move.l rb_SysLib(a5),a6
@@ -1182,6 +1189,7 @@ LIB_Expunge: ; ( libptr: a6 ; returns 0:d0 or seglist:d0 )
11821189
rts
11831190

11841191
LIB_ExtFunc:
1192+
kprintf "replay.audio/LIB_ExtFunc"
11851193
moveq #0,d0
11861194
rts
11871195

@@ -1227,10 +1235,10 @@ PrintAudioCtrl:
12271235

12281236
.AHIST_M8S dc.b "AHIST_M8S = Mono, 8 bit signed (BYTE)",0
12291237
.AHIST_M16S dc.b "AHIST_M16S = Mono, 16 bit signed (WORD)",0
1230-
.AHIST_S8S dc.b "AHIST_S8S = Stereo, 8 bit signed (2�BYTE)",0
1231-
.AHIST_S16S dc.b "AHIST_S16S = Stereo, 16 bit signed (2�WORD)",0
1238+
.AHIST_S8S dc.b "AHIST_S8S = Stereo, 8 bit signed (2xBYTE)",0
1239+
.AHIST_S16S dc.b "AHIST_S16S = Stereo, 16 bit signed (2xWORD)",0
12321240
.AHIST_M32S dc.b "AHIST_M32S = Mono, 32 bit signed (LONG)",0
1233-
.AHIST_S32S dc.b "AHIST_S32S = Stereo, 32 bit signed (2�LONG)",0
1241+
.AHIST_S32S dc.b "AHIST_S32S = Stereo, 32 bit signed (2xLONG)",0
12341242
.AHIST_UNK dc.b "Unknown",0
12351243
even
12361244
ELSE

0 commit comments

Comments
 (0)