From: Toni Wilen <twilen@winuae.net>
Date: Sat, 28 Sep 2019 11:24:36 +0000 (+0300)
Subject: Atari ST fixes.
X-Git-Tag: 4300~94
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=8fbea3b76888830ae4a948714ef78e4d94ada428;p=francis%2Fwinuae.git

Atari ST fixes.
---

diff --git a/cputest/atari.S b/cputest/atari.S
index f43257a2..79978f50 100644
--- a/cputest/atari.S
+++ b/cputest/atari.S
@@ -59,6 +59,8 @@ _touser:
 	move.l	save_hbl,0x68
 	move.l	save_vbl,0x70
 
+	move.w	#0x2300,sr		| enable VBL/MFP 
+
 	move.l	old_ssp(pc),-(sp)
 	move.w	#0x20,-(sp)
         | we must keep the same value of A7 when going back to user mode
diff --git a/cputest/cputestgen.ini b/cputest/cputestgen.ini
index 73be2a76..72256052 100644
--- a/cputest/cputestgen.ini
+++ b/cputest/cputestgen.ini
@@ -19,10 +19,12 @@ verbose=1
 path=data/
 
 ; Low address space limits. Real hardware must have RAM in this space. Comment out to disable.
+; Start should be zero if Amiga, set to 0x0800 if Atari ST.
 test_low_memory_start=0x0000
 test_low_memory_end=0x8000
 
 ; High address space limits (0x00ff8000 to 0x01000000 is complete space if 24-bit). Comment out to disable.
+; Disable if 32-bit CPU or Atari ST.
 test_high_memory_start=0x00ff8000
 test_high_memory_end=0x01000000
 
@@ -34,6 +36,7 @@ test_memory_start=0x780000
 ;test_memory_start=0x68800000
 ;test_memory_start=0x07800000
 ;test_memory_start=0x08800000
+;test_memory_start=0x340000
 test_memory_size=0x080000
 
 ; number of test rounds (registers are re-randomized after each round)
@@ -56,7 +59,7 @@ feature_flags_mode=1
 
 ; SR min interrupt mask
 ; Amiga: can be zero.
-; Atari ST: should be 3 or larger.
+; Atari ST: should be 4 or larger.
 ; Skips all tests that would set lower interrupt mask.
 feature_min_interrupt_mask=0
 
diff --git a/cputest/main.c b/cputest/main.c
index a5007050..ef806026 100644
--- a/cputest/main.c
+++ b/cputest/main.c
@@ -1625,7 +1625,7 @@ static void freestuff(void)
 	if (test_memory && test_memory_addr)
 		free_absolute(test_memory_addr, test_memory_size);
 #ifdef WAITEXIT
-	getch();
+	getchar();
 #endif
 }