Index: iolib/hwdefs.s
===================================================================
--- iolib/hwdefs.s	(revision f40a3096572fd1b0696a7f7c717464e68652e655)
+++ iolib/hwdefs.s	(revision a6f5b952e80b43751c6e71c39b103f7d314f8e4e)
@@ -1,18 +1,18 @@
-* ------------------------------------------------------------------------------
-* hwdefs.s --  External definitions of Buchla 700 I/O addresses
-* Version 14 -- 1988-08-15 -- D.N. Lynx Crowe
-* ------------------------------------------------------------------------------
+| ------------------------------------------------------------------------------
+| hwdefs.s --  External definitions of Buchla 700 I/O addresses
+| Version 14 -- 1988-08-15 -- D.N. Lynx Crowe
+| ------------------------------------------------------------------------------
 		.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	_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
@@ -20,67 +20,67 @@
 		.xdef	_v_win0
 		.xdef	_v_cur
-*
+
 		.xdef	_fc_sw,_fc_val
-*
-* ------------------------------------------------------------------------------
-*
-* Hardware base addresses
-* -----------------------
-_io_fpu		.equ	$180000		* FPU base address
-*
-VB		.equ	$200000		* VSDD base address
-*
-_io_time	.equ	$3A0001		* Timer chip
-_io_lcd		.equ	$3A4001		* LCD controller
-_io_ser		.equ	$3A8001		* Serial ports  (RS232)
-_io_midi	.equ	$3AC001		* MIDI ports
-_io_disk	.equ	$3B0001		* Disk controller
-_io_tone	.equ	$3B4001		* Sound generator chip
-_io_leds	.equ	$3B8001		* LED driver
-_io_kbrd	.equ	$3BC001		* Keyboard / panel processor
-*
-_lcd_a0		.equ	_io_lcd		* LCD port a0
-_lcd_a1		.equ	_io_lcd+2	* LCD port a1
-*
+
+| ------------------------------------------------------------------------------
+
+| Hardware base addresses
+| -----------------------
+_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
+
+_lcd_a0		=	_io_lcd		| LCD port a0
+_lcd_a1		=	_io_lcd+2	| LCD port a1
+
 		.page
-*
-* Video definitions
-* -----------------
-_io_vreg	.equ	VB		* Relocated video registers after setup
-_io_vraw	.equ	VB+$400		* Raw video registers at RESET
-_io_vram	.equ	VB		* Video RAM base address
-*
-* Name			Offset		  Usage			       Bank
-* -------		---------	  -------------------------    ----
-_v_regs		.equ	VB		* Video registers	       0,1
-*
-_v_odtab	.equ	VB+128		* Object Descriptor Table	0
-_v_actab	.equ	VB+256		* Access Table			0
-_v_ct0		.equ	VB+1024		* Character Text-0		0
-_v_gt1		.equ	VB+1304		* Graphics Text-1		0
-_v_score	.equ	VB+8192		* Score object			0
-_v_cgtab	.equ	VB+122880	* Character Generator Table	0
-*
-_v_curs0	.equ	VB+1024		* Cursor object 0  (arrow ULE)	1
-_v_curs1	.equ	VB+1152		* Cursor object 1  (arrow ULO)	1
-_v_curs2	.equ	VB+1280		* Cursor object 2  (arrow URE)	1
-_v_curs3	.equ	VB+1408		* Cursor object 3  (arrow URO)	1
-_v_curs4	.equ	VB+1536		* Cursor object 4  (arrow LLE)	1
-_v_curs5	.equ	VB+1664		* Cursor object 5  (arrow LLO)	1
-_v_curs6	.equ	VB+1792		* Cursor object 6  (arrow LRE)	1
-_v_curs7	.equ	VB+1920		* Cursor object 7  (arrow LRO)	1
-_v_tcur		.equ	VB+2048		* Typewriter cursor		1
-_v_kbobj	.equ	VB+2880		* Keyboard object		1
-_v_lnobj	.equ	VB+4672		* Line object			1
-_v_cur		.equ	VB+6464		* Underline cursor		1
-_v_win0		.equ	VB+16384	* Window-0 object		1
-*
-* BIOS RAM definitions
-* --------------------
-* WARNING: the following addresses must match those of the corresponding
-* variables defined in bios.s or chaos is guaranteed.
-*
-_fc_sw		.equ	$420		* word - Frame counter switch
-_fc_val		.equ	$422		* long - Frame counter value
-*
+
+| 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
+
+| Name			Offset		  Usage			       Bank
+| -------		---------	  -------------------------    ----
+_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_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
+| --------------------
+| WARNING: the following addresses must match those of the corresponding
+| variables defined in bios.s or chaos is guaranteed.
+
+_fc_sw		=	0x420		| word - Frame counter switch
+_fc_val		=	0x422		| long - Frame counter value
+
 		.end
Index: iolib/rtraps.s
===================================================================
--- iolib/rtraps.s	(revision f40a3096572fd1b0696a7f7c717464e68652e655)
+++ iolib/rtraps.s	(revision a6f5b952e80b43751c6e71c39b103f7d314f8e4e)
@@ -1,48 +1,48 @@
-* ------------------------------------------------------------------------------
-* rtraps.s -- define ROMP debug trap
-* Version 7 -- 1988-01-12 -- Copyright 1987, 1988 by D.N. Lynx Crowe
-* ------------------------------------------------------------------------------
+| ------------------------------------------------------------------------------
+| rtraps.s -- define ROMP debug trap
+| Version 7 -- 1988-01-12 -- Copyright 1987, 1988 by D.N. Lynx Crowe
+| ------------------------------------------------------------------------------
 		.text
-*
+
 		.xdef	_trap15
-*
+
 		.xref	_rompbp
-*
+
 		.xref	tr1sav,tr13sav,tr14sav
 		.xref	tr1rmp,tr13rmp,tr14rmp
-*
-BUCHLA		.equ	1		* IPL value:  0 = NASA , 1 = Buchla
-*
+
+BUCHLA		=	1		| IPL value:  0 = NASA , 1 = Buchla
+
 		.ifeq	BUCHLA
-IPLEVEL		.equ	$0400		* NASA IPL = 4    (enable 5 and above)
+IPLEVEL		=	0x0400		| NASA IPL = 4    (enable 5 and above)
 		.endc
-*
+
 		.ifne	BUCHLA
-IPLEVEL		.equ	$0200		* Buchla IPL = 2  (enable 3 and above)
+IPLEVEL		=	0x0200		| Buchla IPL = 2  (enable 3 and above)
 		.endc
-*
-IPL7		.equ	$0700		* IPL 7
-*
-* _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
-		move.l	tr1sav,tr1rmp		* Save trap save areas
-		move.l	tr13sav,tr13rmp		* ...
-		move.l	tr14sav,tr14rmp		* ...
-		move.w	sr,d0			* Get status register
-		andi.w	#$F8FF,d0		* Enable serial I/O interrupts
-		ori.w	#IPLEVEL,d0		* ...
-		move.w	d0,sr			* ...
-		jsr	_rompbp			* Pass control to ROMP
-*
-		ori.w	#IPL7,sr		* Disable interrupts
-		move.l	tr14rmp,tr14sav		* Restore trap save areas
-		move.l	tr13rmp,tr13sav		* ...
-		move.l	tr1rmp,tr1sav		* ...
-		movem.l	(a7)+,d0-d7/a0-a7	* Restore regs
-		addq.l	#2,a7			* Discard alignment filler word
-		rte				* Back to what we interrupted
-*
+
+IPL7		=	0x0700		| IPL 7
+
+| _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
+		move.l	tr1sav,tr1rmp		| Save trap save areas
+		move.l	tr13sav,tr13rmp		| ...
+		move.l	tr14sav,tr14rmp		| ...
+		move.w	sr,d0			| Get status register
+		andi.w	#0xF8FF,d0		| Enable serial I/O interrupts
+		ori.w	#IPLEVEL,d0		| ...
+		move.w	d0,sr			| ...
+		jsr	_rompbp			| Pass control to ROMP
+
+		ori.w	#IPL7,sr		| Disable interrupts
+		move.l	tr14rmp,tr14sav		| Restore trap save areas
+		move.l	tr13rmp,tr13sav		| ...
+		move.l	tr1rmp,tr1sav		| ...
+		movem.l	(a7)+,d0-d7/a0-a7	| Restore regs
+		addq.l	#2,a7			| Discard alignment filler word
+		rte				| Back to what we interrupted
+
 		.end
Index: iolib/setipl.s
===================================================================
--- iolib/setipl.s	(revision f40a3096572fd1b0696a7f7c717464e68652e655)
+++ iolib/setipl.s	(revision a6f5b952e80b43751c6e71c39b103f7d314f8e4e)
@@ -1,44 +1,44 @@
-*
-* setipl.s -- Set internal processor interrupt level
-* --------    --------------------------------------
-* Version 2 -- 1988-06-29 -- D.N. Lynx Crowe
-*
-*	short
-*	setipl(arg);
-*	short arg;
-*
-*	Sets processor interrupt level to arg.
-*	Returns old interrupt level, or -1 if arg < 0 or > 7
-*
-*	Assumes you are in supervisor mode.
-*	You get a Privelege Violation TRAP if you aren't.
-*
+
+| setipl.s -- Set internal processor interrupt level
+| --------    --------------------------------------
+| Version 2 -- 1988-06-29 -- D.N. Lynx Crowe
+
+|	short
+|	setipl(arg);
+|	short arg;
+
+|	Sets processor interrupt level to arg.
+|	Returns old interrupt level, or -1 if arg < 0 or > 7
+
+|	Assumes you are in supervisor mode.
+|	You get a Privelege Violation TRAP if you aren't.
+
 		.text
-*
+
 		.xdef	_setipl
-*
-_setipl:	link	a6,#0			* Link up stack frames
-		move.w	8(a6),d0		* Get argument
-		tst.w	d0			* Check lower limit
-		bmi	setipler		* Jump if < 0  (error)
-*
-		cmpi.w	#7,d0			* Check upper limit
-		bgt	setipler		* Jump if > 7  (error)
-*
-		move.w	sr,d1			* Get current level
-		move.w	d1,d2			* ... save for later
-		lsl.w	#8,d0			* Shift argument into position
-		andi.w	#$F8FF,d1		* Mask out old level
-		or.w	d0,d1			* OR in new level
-		move.w	d2,d0			* Setup return of old level
-		lsr.w	#8,d0			* ...
-		andi.l	#$7,d0			* ...
-		move.w	d1,sr			* Set the new interrupt level
-		unlk	a6			* Unlink stack frames
-		rts				* Return to caller
-*
-setipler:	moveq.l	#-1,d0			* Setup to return error code
-		unlk	a6			* Unlink stack frames
-		rts				* Return to caller
-*
+
+_setipl:	link	a6,#0			| Link up stack frames
+		move.w	8(a6),d0		| Get argument
+		tst.w	d0			| Check lower limit
+		bmi	setipler		| Jump if < 0  (error)
+
+		cmpi.w	#7,d0			| Check upper limit
+		bgt	setipler		| Jump if > 7  (error)
+
+		move.w	sr,d1			| Get current level
+		move.w	d1,d2			| ... save for later
+		lsl.w	#8,d0			| Shift argument into position
+		andi.w	#0xF8FF,d1		| Mask out old level
+		or.w	d0,d1			| OR in new level
+		move.w	d2,d0			| Setup return of old level
+		lsr.w	#8,d0			| ...
+		andi.l	#0x7,d0			| ...
+		move.w	d1,sr			| Set the new interrupt level
+		unlk	a6			| Unlink stack frames
+		rts				| Return to caller
+
+setipler:	moveq.l	#-1,d0			| Setup to return error code
+		unlk	a6			| Unlink stack frames
+		rts				| Return to caller
+
 		.end
Index: iolib/setsr.s
===================================================================
--- iolib/setsr.s	(revision f40a3096572fd1b0696a7f7c717464e68652e655)
+++ iolib/setsr.s	(revision a6f5b952e80b43751c6e71c39b103f7d314f8e4e)
@@ -1,27 +1,27 @@
-*
-* setsr.s -- Set processor status register
-* -------    -----------------------------
-* Version 1 -- 1988-06-29 -- D.N. Lynx Crowe
-*
-*	short
-*	setsr(arg);
-*	short arg;
-*
-*	Sets processor status register to 'arg'.
-*	Returns old status register value.
-*
-*	Assumes you are in supervisor mode.
-*	You get a Privelege Violation TRAP if you aren't.
-*
-*	Coded for speed -- this is as fast as you can get.
-*	No error checking is done -- assumes you know what you're doing.
-*
+
+| setsr.s -- Set processor status register
+| -------    -----------------------------
+| Version 1 -- 1988-06-29 -- D.N. Lynx Crowe
+
+|	short
+|	setsr(arg);
+|	short arg;
+
+|	Sets processor status register to 'arg'.
+|	Returns old status register value.
+
+|	Assumes you are in supervisor mode.
+|	You get a Privelege Violation TRAP if you aren't.
+
+|	Coded for speed -- this is as fast as you can get.
+|	No error checking is done -- assumes you know what you're doing.
+
 		.text
-*
+
 		.xdef	_setsr
-*
-_setsr:		move.w	sr,d0			* Get current sr
-		move.w	4(sp),sr		* Set new sr
-		rts				* Return to caller
-*
+
+_setsr:		move.w	sr,d0			| Get current sr
+		move.w	4(sp),sr		| Set new sr
+		rts				| Return to caller
+
 		.end
Index: iolib/traps.s
===================================================================
--- iolib/traps.s	(revision f40a3096572fd1b0696a7f7c717464e68652e655)
+++ iolib/traps.s	(revision a6f5b952e80b43751c6e71c39b103f7d314f8e4e)
@@ -1,62 +1,62 @@
-*
-* traps.s -- define trap linkages for C routines
-* -------    -----------------------------------
-* Version 8 -- 1987-06-08 -- D.N. Lynx Crowe
-*
-* Caution:  these are serially re-useable, but NOT reentrant, so
-* don't use them in interrupt processing code.
-*
-* An exception is made for ROMP in _trap15 for breakpoints so that the
-* debug code can be debugged.
-*
+
+| traps.s -- define trap linkages for C routines
+| -------    -----------------------------------
+| Version 8 -- 1987-06-08 -- D.N. Lynx Crowe
+
+| Caution:  these are serially re-useable, but NOT reentrant, so
+| don't use them in interrupt processing code.
+
+| 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	tr1sav,tr13sav,tr14sav
 		.xdef	tr1rmp,tr13rmp,tr14rmp
-*
-* _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
-		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
-		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
-		rts				* Return  (usually won't happen)
-*
+
+| _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
+		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
+		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
+		rts				| Return  (usually won't happen)
+
 		.page
-*
-* RAM storage areas
-* -----------------
+
+| RAM storage areas
+| -----------------
 		.bss
 		.even
-*
-tr1sav:		ds.l	1		* Return address for trap1
-tr13sav:	ds.l	1		* Return address for trap13
-tr14sav:	ds.l	1		* Return address for trap14
-*
-tr1rmp:		ds.l	1		* Save area for tr1sav for ROMP
-tr13rmp:	ds.l	1		* Save area for tr13sav for ROMP
-tr14rmp:	ds.l	1		* Save area for tr14sav for ROMP
-*
+
+tr1sav:		ds.l	1		| Return address for trap1
+tr13sav:	ds.l	1		| Return address for trap13
+tr14sav:	ds.l	1		| Return address for trap14
+
+tr1rmp:		ds.l	1		| Save area for tr1sav for ROMP
+tr13rmp:	ds.l	1		| Save area for tr13sav for ROMP
+tr14rmp:	ds.l	1		| Save area for tr14sav for ROMP
+
 		.end
