X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hexed%2Fhexed.s;h=ae77a3eb26060395bb65d2da02423eadbc2679a5;hb=HEAD;hp=b7d918624131cbfd1d52bb60b949451c460edf81;hpb=6f93f411b27296f8a96761061312cd70a15c8884;p=megadrive.git

diff --git a/hexed/hexed.s b/hexed/hexed.s
index b7d9186..95a6930 100644
--- a/hexed/hexed.s
+++ b/hexed/hexed.s
@@ -31,7 +31,9 @@
 
 .equ USE_VINT,        0
 .equ COPY_TO_EXP,     1
-.equ RELOCATE_TO_RAM, 1
+.equ RELOCATE_TO_RAM, 0xff0100 /* addr or 0 to disable */
+.equ COPY_TEST_CODE,  0        /* addr or 0 to disable, copy only */
+.equ PC_TRANSFER,     0
 
 .text
 .globl main
@@ -149,7 +151,7 @@
 .macro do_dpad bit op val
 	btst.l		#\bit,d0
 	beq		0f
-	\op.l		\val,a6
+	\op  		\val,a6
 	bra		dpad_end
 0:
 .endm
@@ -203,7 +205,8 @@ sprite_data_end:
 
 predef_addrs:
 	dc.l 0x000000, 0x200000, 0x400000, 0xa00000, 0xa10000
-	dc.l 0xa11100, 0xa12000, 0xa13000, 0xa14000, 0xc00000
+	dc.l 0xa11100, 0xa12000, 0xa13000, 0xa14000, 0xa15100
+	dc.l 0xc00000
 predef_addrs_end:
 
 safe_addrs:
@@ -214,6 +217,10 @@ safe_addrs:
 	dc.l 0xa12000, 0xa120ff
 	dc.l 0xa13000, 0xa130ff
 safe_addrs_end:
+	dc.l 0xa15100, 0xa1513f
+safe_addrs_end_32x:
+	dc.l 0xa15180, 0xa153ff
+safe_addrs_end_32x_vdp:
 
 sizeof_bin:
 	dc.l _edata
@@ -262,8 +269,44 @@ txt_exc:
 main:
 	/* make sure io port 2 is doing inputs */
 	move.b		#0,(0xa1000b).l
-	/* mask irqs during init */
+	/* make sure irqs are masked */
 	move.w		#0x2700,sr
+	/* take care of TMSS */
+	move.b		(0xa10000).l,d0
+	andi.b		#0x0f,d0
+	beq		no_tmss
+	move.l		#0x53454741,(0xa14000).l
+	/* want cart, not OS rom if cart pops in */
+	move.w		#1,(0xa14100).l
+	/* touch VDP after TMSS setup? */
+	tst.w		(0xc00004).l
+no_tmss:
+
+.if PC_TRANSFER
+	/* want to do early PC transfer (with RAM/VRAM intact and such)?
+	 * also give time PC to see start condition */
+	move.l		#0x2000,d0
+0:	dbra		d0,0b
+
+	move.l		#0xa10005,a0
+	btst.b		#5,(a0)
+	bne		no_early_transfer
+	move.b		#0x40,(0xa1000b).l	/* port 2 ctrl */
+	move.b		#0x00,(a0)		/* port 2 data - start with TH low */
+	move.l		#0x2000,d0
+0:
+	btst.b		#4,(a0)
+	beq		do_early_transfer
+	dbra		d0,0b
+
+	move.b		#0,(0xa1000b).l
+	bra		no_early_transfer	/* timeout */
+
+do_early_transfer:
+	bsr		do_transfer
+
+no_early_transfer:
+.endif
 
 .if COPY_TO_EXP
 	/* copy to expansion device if magic number is set */
@@ -289,34 +332,38 @@ main:
 	move.l		d0,a0
 
 	/* copy, assume 8K size */
-	move.l		#0xFF0100,a1
+	move.l		#RELOCATE_TO_RAM,a2
 	move.l		(sizeof_bin,pc),d0
+	move.l		a2, a1
 	lsr.l		#3,d0
 1:
 	move.l		(a0)+,(a1)+
 	move.l		(a0)+,(a1)+
 	dbra		d0,1b
 
+	lea		(0f,pc),a0
+	move.l		a0,d0
+	and.l		#0x00ffff,d0
+	add.l		d0,a2
+.endif
+
+.if COPY_TEST_CODE
 	/* copy test code */
 	lea             (test_code,pc),a0
-	move.l		#0xffc000,a1
+	move.l		#COPY_TEST_CODE,a1
 	move.w		#(test_code_end - test_code)/2-1,d0
 1:
 	move.w		(a0)+,(a1)+
 	dbra		d0,1b
 
-	lea		(0f,pc),a0
-	move.l		a0,d0
-	and.l		#0x00ffff,d0
-	add.l		#0xFF0100,d0
-	move.l		d0,a0
-
 	/* patch test code */
-	move.l		#0xffc000,a1
+	move.l		#COPY_TEST_CODE,a1
 	add.w		#(test_code_ret_op-test_code+2),a1
-	move.l		a0,(a1)
+	move.l		a2,(a1)
+.endif
 
-	jmp		(a0)
+.if RELOCATE_TO_RAM
+	jmp		(a2)
 0:
 .endif
 
@@ -709,20 +756,20 @@ draw_status_bar:
 	btst.l		#16+4,d0		/* A - scroll modifier */
 	beq		input_noa
 
-	do_dpad		16+0,  sub, #0x0800
-	do_dpad		16+1,  add, #0x0800
-	do_dpad		16+10, sub, #0xd800
-	do_dpad		16+11, add, #0xd800
+	do_dpad		16+0,  sub.l, #0x0800
+	do_dpad		16+1,  add.l, #0x0800
+	do_dpad		16+10, sub.l, #0xd800
+	do_dpad		16+11, add.l, #0xd800
 input_noa:
 	moveq.l		#0,d1
 	move.w		d7,d1
 	lsr.w		#7,d1
 	lsr.w		#7,d1
 
-	do_dpad		0,  subq, #0x0008
-	do_dpad		1,  addq, #0x0008
-	do_dpad		10, sub, d1
-	do_dpad		11, add, d1
+	do_dpad		0,  subq.l, #0x0008
+	do_dpad		1,  addq.l, #0x0008
+	do_dpad		10, sub.l, d1
+	do_dpad		11, add.l, d1
 
 dpad_end:
 	/* update addr */
@@ -1302,6 +1349,7 @@ mode_jmp_finish:
 	jmp		(a0)
 
 mode_transfer:
+.if PC_TRANSFER
 	move.b		#0x40,(0xa1000b).l	/* port 2 ctrl */
 	move.b		#0x00,(0xa10005).l	/* port 2 data - start with TH low */
 
@@ -1317,7 +1365,9 @@ wait_tl_low0:
 	bne		wait_tl_low0
 
 	menu_text	txt_working, 13, 13, 0
-	bra		do_transfer
+	bsr		do_transfer
+.endif
+	bra		return_to_main
 
 # go back to main mode
 return_to_main:
@@ -1364,6 +1414,19 @@ get_safety_mask:
 	lsr.l		#8,d1
 	lea		(safe_addrs,pc),a1
 	move.w		#(safe_addrs_end - safe_addrs)/8-1,d2
+	cmp.l		#0x4D415253,(0xa130ec)	/* 'MARS' */
+	bne		no_32x
+	move.w		#(safe_addrs_end_32x - safe_addrs)/8-1,d2
+	move.w		(0xa15100),d0
+	and.w		#3,d0
+	cmp.w		#3,d0			/* ADEN and nRES */
+	bne		no_32x_vdp
+	btst.b		#7,d0			/* FM */
+	bne		no_32x_vdp
+	move.w		#(safe_addrs_end_32x_vdp - safe_addrs)/8-1,d2
+no_32x_vdp:
+no_32x:
+
 0:
 	move.l		(a1)+,d0
 	cmp.l		d0,d1
@@ -1582,12 +1645,14 @@ wait_vsync_poll:
 	rts
 
 
+.if COPY_TEST_CODE
 test_code:
 	nop
 
 test_code_ret_op:
 	jmp	0x123456        /* will be patched */
 test_code_end:
+.endif
 
 #################################################
 #                                               #