From: Toni Wilen <twilen@winuae.net>
Date: Sat, 28 Sep 2019 09:50:53 +0000 (+0300)
Subject: ST support updates.
X-Git-Tag: 4300~96
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=80fe280dd55ac8bb703e68576d718f780805666d;p=francis%2Fwinuae.git

ST support updates.
---

diff --git a/cputest/atari.S b/cputest/atari.S
index e2871f01..f43257a2 100644
--- a/cputest/atari.S
+++ b/cputest/atari.S
@@ -44,7 +44,7 @@ _tosuper:
 
 	move.w	0xff8240,save_color0
 
-	move.w	#0x2500,sr		| disable HBL/VBL
+	move.w	#0x2700,sr		| disable HBL/VBL
 	rts
 
 	| back to user mode, enable MFP interrupts
diff --git a/cputest/main.c b/cputest/main.c
index e4c80548..a5007050 100644
--- a/cputest/main.c
+++ b/cputest/main.c
@@ -1624,6 +1624,9 @@ static void freestuff(void)
 {
 	if (test_memory && test_memory_addr)
 		free_absolute(test_memory_addr, test_memory_size);
+#ifdef WAITEXIT
+	getch();
+#endif
 }
 
 
@@ -1841,9 +1844,6 @@ int main(int argc, char *argv[])
 
 #define _stricmp strcasecmp
 
-	if (strlen(argv[1]) >= sizeof(opcode) - 1)
-		return 0;
-
 	strcpy(path, "data/");
 
 	low_memory = (uae_u8 *)0;
@@ -1878,6 +1878,9 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
+	if (strlen(argv[1]) >= sizeof(opcode) - 1)
+		return 0;
+
 	strcpy(opcode, argv[1]);
 
 	check_undefined_sr = 1;
diff --git a/cputest/makefile.st b/cputest/makefile.st
index 141aa0f1..3cc45d83 100644
--- a/cputest/makefile.st
+++ b/cputest/makefile.st
@@ -5,7 +5,7 @@ NOWTIME := "\"$(shell date "+%T")\""
 CC=/opt/m68k-atari/bin/m68k-atari-mint-gcc
 AS=/opt/m68k-atari/bin/m68k-atari-mint-as
 
-CFLAGS = -O2 -m68000 -fomit-frame-pointer -msoft-float -DREVDATE=$(NOWDATE) -DREVTIME=$(NOWTIME) -DM68K
+CFLAGS = -O2 -m68000 -fomit-frame-pointer -msoft-float -DREVDATE=$(NOWDATE) -DREVTIME=$(NOWTIME) -DM68K -DWAITEXIT
 LINK_CFLAGS = -lm -s
 
 OBJS = main.o asm040.o atari.o \
@@ -13,7 +13,7 @@ OBJS = main.o asm040.o atari.o \
 	opcode_handler_mmu.o opcodes_cpu.o opcodes_fpu.o opcodes_mmu.o util.o
 
 all: $(OBJS)
-	$(CC) $(LINK_CFLAGS) -o cputest $^
+	$(CC) $(LINK_CFLAGS) -o cputest.ttp $^
 
 main.o: main.c
 	$(CC) $(CFLAGS) -I. -c -o $@ main.c