Use Supexec() to query EdDI version. Fixes for Coldfire CPU build.

Contributed by Miro Kropacek
libsdl-org · May 22, 2019 · e7ea07e · e7ea07e
1 parent fb1eded
commit e7ea07e
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/src/video/ataricommon/SDL_atarieddi.S b/src/video/ataricommon/SDL_atarieddi.S
@@ -33,10 +33,38 @@
 /*--- Vector installer ---*/
 
 _Atari_get_EdDI_version:
-	movel	sp@(4),a0	/* Value of EdDI cookie */
+#if defined(__mcoldfire__)
+	movel	sp@(4),a0
+	movel	a0,eddi_cookie
+	lea	sp@(-8),sp
+	moveml	d2/a2,sp@
+#else
+	movel	sp@(4),eddi_cookie
+	moveml	d2/a2,sp@-
+#endif
+
+	/* Supexec() to avoid crash on FreeMiNT with MP */
+	pea	get_EdDI_version(pc)
+	movew	#38,sp@-
+	trap	#14
+	addql	#6,sp
+
+#if defined(__mcoldfire__)
+	moveml	sp@,d2/a2
+	lea	sp@(8),sp
+#else
+	moveml	sp@+,d2/a2
+#endif
+	rts
+
+get_EdDI_version:
+	movel	eddi_cookie,a0
 
 	/* Call EdDI function #0 */
 	clrw	d0
-	jsr	(a0)
+	jmp	(a0)
 
-	rts
+	.bss
+
+	.even
+	.comm	eddi_cookie, 4