--- BasiliskII/src/AmigaOS/asm_support.asm	2000/08/20 14:08:41	1.5
+++ BasiliskII/src/AmigaOS/asm_support.asm	2001/02/02 20:52:57	1.9
@@ -1,7 +1,7 @@
 *
 * asm_support.asm - AmigaOS utility functions in assembly language
 *
-* Basilisk II (C) 1997-1999 Christian Bauer
+* Basilisk II (C) 1997-2001 Christian Bauer
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 		XDEF	_AtomicAnd
 		XDEF	_AtomicOr
 		XDEF	_MoveVBR
+		XDEF	_DisableSuperBypass
 		XDEF	_Execute68k
 		XDEF	_Execute68kTrap
 		XDEF	_TrapHandlerAsm
@@ -47,10 +48,11 @@
 		XREF	_MainTask
 		XREF	_SysBase
 		XREF	_quit_emulator
-		XREF	_kprintf
 
 		SECTION	text,CODE
 
+		MACHINE	68020
+
 *
 * Atomic bit operations (don't trust the compiler)
 *
@@ -108,6 +110,29 @@ setvbr		movec	d0,vbr
 		rte
 
 *
+* Disable 68060 Super Bypass mode
+*
+
+_DisableSuperBypass
+		movem.l	d0-d1/a0-a1/a5-a6,-(sp)
+		move.l	_SysBase,a6
+
+		lea	dissb,a5
+		JSRLIB	Supervisor
+
+		movem.l	(sp)+,d0-d1/a0-a1/a5-a6
+		rts
+
+		MACHINE	68060
+
+dissb		movec	pcr,d0
+		bset	#5,d0
+		movec	d0,pcr
+		rte
+
+		MACHINE	68020
+
+*
 * Execute 68k subroutine (must be ended with rts)
 * r->a[7] and r->sr are unused!
 *
@@ -185,7 +210,7 @@ _ExceptionHandlerAsm
 		pea	1$
 		move.w	_EmulatedSR,d0
 		move.w	d0,-(sp)
-		or.w	#$0100,d0		;Set interrupt level in SR
+		or.w	#$2100,d0		;Set interrupt level in SR, enter (virtual) supervisor mode
 		move.w	d0,_EmulatedSR
 		move.l	$64.w,-(sp)		;Jump to MacOS interrupt handler
 		rts
@@ -296,14 +321,14 @@ _TrapHandlerAsm:
 		cmp.l	#47,(sp)
 		ble	doTrapXX		; Vector 32-47 : TRAP #0 - 15 Instruction Vectors
 
-1$:		move.l	_OldTrapHandler,-(sp)	;No, jump to old trap handler
+1$		move.l	_OldTrapHandler,-(sp)	;No, jump to old trap handler
 		rts
 
 *
 * TRAP #0 - 15 Instruction Vectors
 *
 
-doTrapXX:	move.l	a0,(sp)			;Save a0
+doTrapXX	move.l	a0,(sp)			;Save a0
 		move.l	usp,a0			;Get user stack pointer
 		move.l	2*4(sp),-(a0)		;Copy 4-word stack frame to user stack
 		move.l	1*4(sp),-(a0)
@@ -321,7 +346,7 @@ doTrapXX:	move.l	a0,(sp)			;Save a0
 * trace Vector
 *
 
-dotrace:	move.l	a0,(sp)			;Save a0
+dotrace		move.l	a0,(sp)			;Save a0
 
 		move.l	usp,a0			;Get user stack pointer
 		move.l	3*4(sp),-(a0)		;Copy 6-word stack frame to user stack
@@ -351,32 +376,14 @@ doaline		move.l	a0,(sp)			;Save a0
 		addq.l	#8,sp			;Remove exception frame from supervisor stack
 		andi	#$d8ff,sr		;Switch to user mode, enable interrupts
 
-	IFNE	0
-
-;		move.w	([2,sp]),($3800)
-
-		cmp.w	#$a9c3,([2,sp])
-		bne	1$
-
-		move.l	d0,-(sp)
-		move.l	a0,-(sp)
-		pea	afmt(pc)
-		jsr	_kprintf
-		lea	3*4(sp),sp
-1$:
-	ENDC
-
 		move.l	$28.w,-(sp)		;Jump to MacOS exception handler
 		rts
 
-afmt:		dc.b	'a0=%08lx  d0=%08lx\n',0
-		cnop	0,4
-
 *
 * Illegal address handler
 *
 
-doilladdr:	move.l	a0,(sp)			;Save a0
+doilladdr	move.l	a0,(sp)			;Save a0
 
 		move.l	usp,a0			;Get user stack pointer
 		move.l	3*4(sp),-(a0)		;Copy 6-word stack frame to user stack
@@ -397,8 +404,7 @@ doilladdr:	move.l	a0,(sp)			;Save a0
 *   to execute extended opcodes (see emul_op.h)
 *
 
-doillinstr
-		movem.l	a0/d0,-(sp)
+doillinstr	movem.l	a0/d0,-(sp)
 		move.w	([6+2*4,sp]),d0
 		and.w	#$ff00,d0
 		cmp.w	#$7100,d0
@@ -418,8 +424,7 @@ doillinstr
 		move.l	$10.w,-(sp)		;Jump to MacOS exception handler
 		rts
 
-1$:
-		move.l	a6,(sp)			;Save a6
+1$		move.l	a6,(sp)			;Save a6
 		move.l	usp,a6			;Get user stack pointer
 
 		move.l	a6,-10(a6)		;Push USP (a7)
@@ -474,7 +479,7 @@ doprivviol	move.l	d0,(sp)			;Save d0
 		cmp.w	#$40d0,d0		;move sr,(a0)?
 		beq	movefromsra0
 		cmp.w	#$40d7,d0		;move sr,(sp)?
-		beq	movefromsrsp	;+++jl+++
+		beq	movefromsrsp
 
 		cmp.w	#$f327,d0		;fsave -(sp)?
 		beq	fsavepush
@@ -717,7 +722,7 @@ frestorea5	move.l	(sp),d0			;Restore d0
 		rte
 
 ; fsave xxx(a5) +jl+
-fsavea5:	move.l	(sp),d0			;Restore d0
+fsavea5		move.l	(sp),d0			;Restore d0
 		move.l	a0,(sp)			;Save a0
 		move.l	a5,a0			;Get base register
 		add.w	([6,sp],2),a0		;Add offset to base register
@@ -746,8 +751,8 @@ pvrte		movem.l	a0/a1,-(sp)		;Save a0 and
 		lea	16+4(sp),a1		; destination address (in supervisor stack)
 		bra	1$
 
-2$:		move.w	(a0)+,(a1)+		; copy additional stack words back to supervisor stack
-1$:		dbf	d0,2$
+2$		move.w	(a0)+,(a1)+		; copy additional stack words back to supervisor stack
+1$		dbf	d0,2$
 
 		move.l	a0,usp			;Update USP
 		movem.l	(sp)+,a0/a1		;Restore a0 and a1
@@ -889,21 +894,21 @@ movecfromcr	move.w	([6,sp],2),d0		;Get n
 		beq.s	movectcd0
 		cmp.w	#$1003,d0		;movec tc,d1?
 		beq.s	movectcd1
-		cmp.w	#$1000,d0		;movec SFC,d1?
+		cmp.w	#$1000,d0		;movec sfc,d1?
 		beq	movecsfcd1
-		cmp.w	#$1001,d0		;movec DFC,d1?
+		cmp.w	#$1001,d0		;movec dfc,d1?
 		beq	movecdfcd1
-		cmp.w	#$0806,d0		;movec URP,d0?
+		cmp.w	#$0806,d0		;movec urp,d0?
 		beq	movecurpd0
-		cmp.w	#$0807,d0		;movec SRP,d0?
+		cmp.w	#$0807,d0		;movec srp,d0?
 		beq.s	movecsrpd0
-		cmp.w	#$0004,d0		;movec ITT0,d0
+		cmp.w	#$0004,d0		;movec itt0,d0
 		beq.s	movecitt0d0
-		cmp.w	#$0005,d0		;movec ITT1,d0
+		cmp.w	#$0005,d0		;movec itt1,d0
 		beq.s	movecitt1d0
-		cmp.w	#$0006,d0		;movec DTT0,d0
+		cmp.w	#$0006,d0		;movec dtt0,d0
 		beq.s	movecdtt0d0
-		cmp.w	#$0007,d0		;movec DTT1,d0
+		cmp.w	#$0007,d0		;movec dtt1,d0
 		beq.s	movecdtt1d0
 
 		bra	pv_unhandled
@@ -950,24 +955,24 @@ movectcd1	move.l	(sp)+,d0		;Restore d0
 		addq.l	#4,2(sp)
 		rte
 
-; movec SFC,d1	+jl+
-movecsfcd1:	move.l	(sp)+,d0		;Restore d0
-		moveq	#0,d1			;MMU is always off
+; movec sfc,d1	+jl+
+movecsfcd1	move.l	(sp)+,d0		;Restore d0
+		moveq	#0,d1
 		addq.l	#4,2(sp)
 		rte
 
-; movec DFC,d1	+jl+
-movecdfcd1:	move.l	(sp)+,d0		;Restore d0
-		moveq	#0,d1			;MMU is always off
+; movec dfc,d1	+jl+
+movecdfcd1	move.l	(sp)+,d0		;Restore d0
+		moveq	#0,d1
 		addq.l	#4,2(sp)
 		rte
 
-movecurpd0:		; movec URP,d0	+jl+
-movecsrpd0:		; movec SRP,d0
-movecitt0d0:		; movec ITT0,d0
-movecitt1d0:		; movec ITT1,d0
-movecdtt0d0:		; movec DTT0,d0
-movecdtt1d0:		; movec DTT1,d0
+movecurpd0		; movec urp,d0	+jl+
+movecsrpd0		; movec srp,d0
+movecitt0d0		; movec itt0,d0
+movecitt1d0		; movec itt1,d0
+movecdtt0d0		; movec dtt0,d0
+movecdtt1d0		; movec dtt1,d0
 		addq.l	#4,sp
 		moveq.l	#0,d0			;MMU is always off
 		addq.l	#4,2(sp)		;skip instruction
@@ -984,9 +989,9 @@ movectocr	move.w	([6,sp],2),d0		;Get nex
 		beq.s	movectocacr
 		cmp.w	#$1002,d0		;movec d1,cacr?
 		beq.s	movectocacr
-		cmp.w	#$1000,d0		;movec d1,SFC?
+		cmp.w	#$1000,d0		;movec d1,sfc?
 		beq.s	movectoxfc
-		cmp.w	#$1001,d0		;movec d1,DFC?
+		cmp.w	#$1001,d0		;movec d1,dfc?
 		beq.s	movectoxfc
 
 		bra	pv_unhandled
@@ -1005,8 +1010,8 @@ movectocacr	movem.l	d1/a0-a1/a6,-(sp)	;M
 		addq.l	#4,2(sp)
 		rte
 
-; movec x,SFC
-; movec x,DFC
+; movec x,sfc
+; movec x,dfc
 movectoxfc	move.l	(sp)+,d0		;Ignore moves to SFC, DFC
 		addq.l	#4,2(sp)
 		rte
@@ -1022,19 +1027,19 @@ cpushadcic	movem.l	d1/a0-a1/a6,-(sp)	;Cl
 		rte
 
 ; move usp,a1	+jl+
-moveuspa1:	move.l	(sp)+,d0
+moveuspa1	move.l	(sp)+,d0
 		move	usp,a1
 		addq.l	#2,2(sp)
 		rte
 
 ; move usp,a0	+jl+
-moveuspa0:	move.l	(sp)+,d0
+moveuspa0	move.l	(sp)+,d0
 		move	usp,a0
 		addq.l	#2,2(sp)
 		rte
 
 ; move a1,usp	+jl+
-moved1usp:	move.l	(sp)+,d0
+moved1usp	move.l	(sp)+,d0
 		move	a1,usp
 		addq.l	#2,2(sp)
 		rte
@@ -1043,8 +1048,7 @@ moved1usp:	move.l	(sp)+,d0
 ; Trigger NMI (Pop up debugger)
 ;
 
-_AsmTriggerNMI:
-		move.l	d0,-(sp)		;Save d0
+_AsmTriggerNMI	move.l	d0,-(sp)		;Save d0
 		move.w	#$007c,-(sp)		;Yes, fake NMI stack frame
 		pea	1$
 		move.w	_EmulatedSR,d0