gistfile1.txt

diff -Naur bass-old/arch/snes-cpu/snes-cpu.cpp bass/arch/snes-cpu/snes-cpu.cpp
--- bass-old/arch/snes-cpu/snes-cpu.cpp	2011-09-11 11:15:29.484243021 +0200
+++ bass/arch/snes-cpu/snes-cpu.cpp	2011-09-11 11:17:20.210914970 +0200
@@ -31,19 +31,22 @@
 
   auto isbyte = [this]() {
     if(param.wildcard("$????") || param.wildcard("$??????")) return false;
-    if(!priority && param[0] != '<' && !param.wildcard("$??")) return false;
+    if(param.wildcard("0x????") || param.wildcard("0x??????")) return false;
+    if(!priority && param[0] != '<' && !param.wildcard("$??") && !param.wildcard("0x??")) return false;
     return true;
   };
 
   auto isword = [this]() {
     if(param.wildcard("$??") || param.wildcard("$??????")) return false;
-    if(!priority && param[0] != '>' && !param.wildcard("$????")) return false;
+    if(param.wildcard("0x??") || param.wildcard("0x??????")) return false;
+    if(!priority && param[0] != '>' && !param.wildcard("$????") && !param.wildcard("0x????")) return false;
     return true;
   };
 
   auto islong = [this]() {
     if(param.wildcard("$??") || param.wildcard("$????")) return false;
-    if(!priority && param[0] != '^' && !param.wildcard("$??????")) return false;
+    if(param.wildcard("0x??") || param.wildcard("0x????")) return false;
+    if(!priority && param[0] != '^' && !param.wildcard("$??????") && !param.wildcard("0x??????")) return false;
     return true;
   };
 
diff -Naur bass-old/arch/snes-cpu-canonical/snes-cpu-canonical.cpp bass/arch/snes-cpu-canonical/snes-cpu-canonical.cpp
--- bass-old/arch/snes-cpu-canonical/snes-cpu-canonical.cpp	2011-09-11 11:15:29.484243021 +0200
+++ bass/arch/snes-cpu-canonical/snes-cpu-canonical.cpp	2011-09-11 11:17:20.210914970 +0200
@@ -23,9 +23,13 @@
   }
 
   function<void ()> detectSize = [&name, &arg, &size]() {
-         if(arg.wildcard("$??"    )) size = 1;
-    else if(arg.wildcard("$????"  )) size = 2;
-    else if(arg.wildcard("$??????")) size = 3;
+         if(arg.wildcard("$??"     )) size = 1;
+    else if(arg.wildcard("$????"   )) size = 2;
+    else if(arg.wildcard("$??????" )) size = 3;
+    else if(arg.wildcard("0x??"    )) size = 1;
+    else if(arg.wildcard("0x????"  )) size = 2;
+    else if(arg.wildcard("0x??????")) size = 3;
+
          if(name.endswith(".b")) { size = 1; name.rtrim<1>(".b"); }
     else if(name.endswith(".w")) { size = 2; name.rtrim<1>(".w"); }
     else if(name.endswith(".l")) { size = 3; name.rtrim<1>(".l"); }
diff -Naur bass-old/arch/snes-smp/snes-smp.cpp bass/arch/snes-smp/snes-smp.cpp
--- bass-old/arch/snes-smp/snes-smp.cpp	2011-09-11 11:15:29.484243021 +0200
+++ bass/arch/snes-smp/snes-smp.cpp	2011-09-11 11:19:03.844253249 +0200
@@ -16,13 +16,15 @@
 
   auto isbyte = [this]() {
     if(args.wildcard("$????")) return false;
-    if(!priority && args[0] != '<' && !args.wildcard("$??")) return false;
+    if(args.wildcard("0x????")) return false;
+    if(!priority && args[0] != '<' && !args.wildcard("$??") && !args.wildcard("0x??")) return false;
     return true;
   };
 
   auto isword = [this]() {
     if(args.wildcard("$??")) return false;
-    if(!priority && args[0] != '>' && !args.wildcard("$????")) return false;
+    if(args.wildcard("0x??")) return false;
+    if(!priority && args[0] != '>' && !args.wildcard("$????") && !args.wildcard("0x????")) return false;
     return true;
   };
 
diff -Naur bass-old/arch/snes-smp-canonical/snes-smp-canonical.cpp bass/arch/snes-smp-canonical/snes-smp-canonical.cpp
--- bass-old/arch/snes-smp-canonical/snes-smp-canonical.cpp	2011-09-11 11:15:29.484243021 +0200
+++ bass/arch/snes-smp-canonical/snes-smp-canonical.cpp	2011-09-11 11:18:02.127583636 +0200
@@ -14,6 +14,8 @@
     if(name.endswith(".w")) { size = 2; name.rtrim<1>(".w"); return; }
     if(args.wildcard("$??"  )) { size = 1; return; }
     if(args.wildcard("$????")) { size = 2; return; }
+    if(args.wildcard("0x??"  )) { size = 1; return; }
+    if(args.wildcard("0x????")) { size = 2; return; }
   };
 
   //two-argument