From 0a7c2f986afd39fd183712c3b9d77d823e9d88e3 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Tue, 1 Mar 2005 20:04:16 +0000
Subject: [PATCH] Added detection code for MMX2

---
 zsnes/src/ui.asm | 10 +++++-----
 zsnes/src/uic.c  |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 8eea6a7a..64c085ed 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -25,7 +25,7 @@ EXTSYM ConvertJoyMap,ConvertJoyMap1,ConvertJoyMap2,printhex
 EXTSYM StartUp,PrintStr,WaitForKey,PrintChar,ZFileSystemInit
 EXTSYM SystemInit,allocmem
 EXTSYM cfgsoundon
-EXTSYM xa
+EXTSYM xa,MMX2Support
 EXTSYM ram7fa,wramdataa
 EXTSYM malloc,free
 EXTSYM MMXSupport,ScreenScale,SoundQuality
@@ -1097,16 +1097,16 @@ NEWSYM MMXCheck
 
     ; MMX support
     mov byte[MMXSupport],0
+    mov byte[MMX2Support],0
     mov eax,1
     CPUID
 
     test edx,1 << 23
     jz .nommx
     mov byte[MMXSupport],1
-    cmp byte[GUIOn2],1
-    je .noprintstr
-    mov edx,YesMMX
-    call PrintStr
+    test edx,1 << 25
+    jz .nommx
+    mov byte[MMX2Support],1
 .noprintstr
 .nommx
     ret
diff --git a/zsnes/src/uic.c b/zsnes/src/uic.c
index 01da4f05..90bbf626 100644
--- a/zsnes/src/uic.c
+++ b/zsnes/src/uic.c
@@ -139,6 +139,7 @@ unsigned char *spc7110romptr;
  
 unsigned char MusicRelVol   = 75;
 unsigned char MusicVol      = 0;
+unsigned char MMX2Support   = 0;
 
 void outofmemory();
 void init();