Index: iolib/hwdefs.s =================================================================== --- iolib/hwdefs.s (revision 4cfe69aa0cc00430379e3934cf85c7a661bf1769) +++ iolib/hwdefs.s (revision 197ff76a1a6e3dac031f1d386945a4be68fb9ce6) @@ -5,21 +5,21 @@ .text - .xdef _io_time,_io_lcd,_io_ser,_io_midi - .xdef _io_disk,_io_tone,_io_leds,_io_kbrd - .xdef _io_vreg,_io_vraw,_io_vram,_io_fpu - .xdef _lcd_a0,_lcd_a1 + .xdef io_time,io_lcd,io_ser,io_midi + .xdef io_disk,io_tone,io_leds,io_kbrd + .xdef io_vreg,io_vraw,io_vram,io_fpu + .xdef lcd_a0,lcd_a1 - .xdef _v_regs,_v_odtab,_v_actab - .xdef _v_ct0 - .xdef _v_gt1 - .xdef _v_score,_v_cgtab + .xdef v_regs,v_odtab,v_actab + .xdef v_ct0 + .xdef v_gt1 + .xdef v_score,v_cgtab - .xdef _v_curs0,_v_curs1,_v_curs2,_v_curs3 - .xdef _v_curs4,_v_curs5,_v_curs6,_v_curs7 - .xdef _v_kbobj,_v_lnobj,_v_tcur - .xdef _v_win0 - .xdef _v_cur + .xdef v_curs0,v_curs1,v_curs2,v_curs3 + .xdef v_curs4,v_curs5,v_curs6,v_curs7 + .xdef v_kbobj,v_lnobj,v_tcur + .xdef v_win0 + .xdef v_cur - .xdef _fc_sw,_fc_val + .xdef fc_sw,fc_val | ------------------------------------------------------------------------------ @@ -27,19 +27,19 @@ | Hardware base addresses | ----------------------- -_io_fpu = 0x180000 | FPU base address +io_fpu = 0x180000 | FPU base address VB = 0x200000 | VSDD base address -_io_time = 0x3A0001 | Timer chip -_io_lcd = 0x3A4001 | LCD controller -_io_ser = 0x3A8001 | Serial ports (RS232) -_io_midi = 0x3AC001 | MIDI ports -_io_disk = 0x3B0001 | Disk controller -_io_tone = 0x3B4001 | Sound generator chip -_io_leds = 0x3B8001 | LED driver -_io_kbrd = 0x3BC001 | Keyboard / panel processor +io_time = 0x3A0001 | Timer chip +io_lcd = 0x3A4001 | LCD controller +io_ser = 0x3A8001 | Serial ports (RS232) +io_midi = 0x3AC001 | MIDI ports +io_disk = 0x3B0001 | Disk controller +io_tone = 0x3B4001 | Sound generator chip +io_leds = 0x3B8001 | LED driver +io_kbrd = 0x3BC001 | Keyboard / panel processor -_lcd_a0 = _io_lcd | LCD port a0 -_lcd_a1 = _io_lcd+2 | LCD port a1 +lcd_a0 = io_lcd | LCD port a0 +lcd_a1 = io_lcd+2 | LCD port a1 .page @@ -47,32 +47,32 @@ | Video definitions | ----------------- -_io_vreg = VB | Relocated video registers after setup -_io_vraw = VB+0x400 | Raw video registers at RESET -_io_vram = VB | Video RAM base address +io_vreg = VB | Relocated video registers after setup +io_vraw = VB+0x400 | Raw video registers at RESET +io_vram = VB | Video RAM base address | Name Offset Usage Bank | ------- --------- ------------------------- ---- -_v_regs = VB | Video registers 0,1 +v_regs = VB | Video registers 0,1 -_v_odtab = VB+128 | Object Descriptor Table 0 -_v_actab = VB+256 | Access Table 0 -_v_ct0 = VB+1024 | Character Text-0 0 -_v_gt1 = VB+1304 | Graphics Text-1 0 -_v_score = VB+8192 | Score object 0 -_v_cgtab = VB+122880 | Character Generator Table 0 +v_odtab = VB+128 | Object Descriptor Table 0 +v_actab = VB+256 | Access Table 0 +v_ct0 = VB+1024 | Character Text-0 0 +v_gt1 = VB+1304 | Graphics Text-1 0 +v_score = VB+8192 | Score object 0 +v_cgtab = VB+122880 | Character Generator Table 0 -_v_curs0 = VB+1024 | Cursor object 0 (arrow ULE) 1 -_v_curs1 = VB+1152 | Cursor object 1 (arrow ULO) 1 -_v_curs2 = VB+1280 | Cursor object 2 (arrow URE) 1 -_v_curs3 = VB+1408 | Cursor object 3 (arrow URO) 1 -_v_curs4 = VB+1536 | Cursor object 4 (arrow LLE) 1 -_v_curs5 = VB+1664 | Cursor object 5 (arrow LLO) 1 -_v_curs6 = VB+1792 | Cursor object 6 (arrow LRE) 1 -_v_curs7 = VB+1920 | Cursor object 7 (arrow LRO) 1 -_v_tcur = VB+2048 | Typewriter cursor 1 -_v_kbobj = VB+2880 | Keyboard object 1 -_v_lnobj = VB+4672 | Line object 1 -_v_cur = VB+6464 | Underline cursor 1 -_v_win0 = VB+16384 | Window-0 object 1 +v_curs0 = VB+1024 | Cursor object 0 (arrow ULE) 1 +v_curs1 = VB+1152 | Cursor object 1 (arrow ULO) 1 +v_curs2 = VB+1280 | Cursor object 2 (arrow URE) 1 +v_curs3 = VB+1408 | Cursor object 3 (arrow URO) 1 +v_curs4 = VB+1536 | Cursor object 4 (arrow LLE) 1 +v_curs5 = VB+1664 | Cursor object 5 (arrow LLO) 1 +v_curs6 = VB+1792 | Cursor object 6 (arrow LRE) 1 +v_curs7 = VB+1920 | Cursor object 7 (arrow LRO) 1 +v_tcur = VB+2048 | Typewriter cursor 1 +v_kbobj = VB+2880 | Keyboard object 1 +v_lnobj = VB+4672 | Line object 1 +v_cur = VB+6464 | Underline cursor 1 +v_win0 = VB+16384 | Window-0 object 1 | BIOS RAM definitions @@ -81,6 +81,6 @@ | variables defined in bios.s or chaos is guaranteed. -_fc_sw = 0x420 | word - Frame counter switch -_fc_val = 0x422 | long - Frame counter value +fc_sw = 0x420 | word - Frame counter switch +fc_val = 0x422 | long - Frame counter value .end Index: iolib/rtraps.s =================================================================== --- iolib/rtraps.s (revision 4cfe69aa0cc00430379e3934cf85c7a661bf1769) +++ iolib/rtraps.s (revision 197ff76a1a6e3dac031f1d386945a4be68fb9ce6) @@ -5,7 +5,7 @@ .text - .xdef _trap15 + .xdef trap15 - .xref _rompbp + .xref rompbp .xref tr1sav,tr13sav,tr14sav @@ -24,7 +24,7 @@ IPL7 = 0x0700 | IPL 7 -| _trap15 -- ROMP debug trap (used to implement breakpoints) -| ------- ------------------------------------------------ -_trap15: ori.w #IPL7,sr | Disable interrupts +| trap15 -- ROMP debug trap (used to implement breakpoints) +| ------ ------------------------------------------------ +trap15: ori.w #IPL7,sr | Disable interrupts move.w #0,-(a7) | Keep stack long aligned movem.l d0-d7/a0-a7,-(a7) | Save regs on stack @@ -36,5 +36,5 @@ ori.w #IPLEVEL,d0 | ... move.w d0,sr | ... - jsr _rompbp | Pass control to ROMP + jsr rompbp | Pass control to ROMP ori.w #IPL7,sr | Disable interrupts Index: iolib/setipl.s =================================================================== --- iolib/setipl.s (revision 4cfe69aa0cc00430379e3934cf85c7a661bf1769) +++ iolib/setipl.s (revision 197ff76a1a6e3dac031f1d386945a4be68fb9ce6) @@ -16,7 +16,7 @@ .text - .xdef _setipl + .xdef setipl -_setipl: link a6,#0 | Link up stack frames +setipl: link a6,#0 | Link up stack frames move.w 8(a6),d0 | Get argument tst.w d0 | Check lower limit Index: iolib/setsr.s =================================================================== --- iolib/setsr.s (revision 4cfe69aa0cc00430379e3934cf85c7a661bf1769) +++ iolib/setsr.s (revision 197ff76a1a6e3dac031f1d386945a4be68fb9ce6) @@ -19,7 +19,7 @@ .text - .xdef _setsr + .xdef setsr -_setsr: move.w sr,d0 | Get current sr +setsr: move.w sr,d0 | Get current sr move.w 4(sp),sr | Set new sr rts | Return to caller Index: iolib/traps.s =================================================================== --- iolib/traps.s (revision 4cfe69aa0cc00430379e3934cf85c7a661bf1769) +++ iolib/traps.s (revision 197ff76a1a6e3dac031f1d386945a4be68fb9ce6) @@ -7,40 +7,40 @@ | don't use them in interrupt processing code. -| An exception is made for ROMP in _trap15 for breakpoints so that the +| An exception is made for ROMP in trap15 for breakpoints so that the | debug code can be debugged. .text - .xdef _trap1 - .xdef _trap13,_trap14 - .xdef _xtrap15 + .xdef trap1 + .xdef trap13,trap14 + .xdef xtrap15 .xdef tr1sav,tr13sav,tr14sav .xdef tr1rmp,tr13rmp,tr14rmp -| _trap1 -- provide access to BDOS functions -| ------ -------------------------------- -_trap1: move.l (a7)+,tr1sav | Save return address +| trap1 -- provide access to BDOS functions +| ----- -------------------------------- +trap1: move.l (a7)+,tr1sav | Save return address trap #1 | Do the trap move.l tr1sav,-(a7) | Restore return address rts | Return to caller -| _trap13 -- provide access to BIOS functions -| ------- -------------------------------- -_trap13: move.l (a7)+,tr13sav | Save return address +| trap13 -- provide access to BIOS functions +| ------ -------------------------------- +trap13: move.l (a7)+,tr13sav | Save return address trap #13 | Do the trap move.l tr13sav,-(a7) | Restore return address rts | Return to caller -| _trap14 -- provide access to extended BIOS functions -| ------- ----------------------------------------- -_trap14: move.l (a7)+,tr14sav | Save return address +| trap14 -- provide access to extended BIOS functions +| ------ ----------------------------------------- +trap14: move.l (a7)+,tr14sav | Save return address trap #14 | Do the trap move.l tr14sav,-(a7) | Restore return address rts | Return to caller -| _xtrap15 -- Setup initial register trap for ROMP -| -------- ------------------------------------ -_xtrap15: trap #15 | TRAP into ROMP +| xtrap15 -- Setup initial register trap for ROMP +| ------- ------------------------------------ +xtrap15: trap #15 | TRAP into ROMP rts | Return (usually won't happen)