Fix for bad branch handling in OP.

[virtualjaguar] / src / tom.cpp

diff --git a/src/tom.cpp b/src/tom.cpp
index 34d7696f6fc6c9cd9241050dfa0d73d33ed54884..6ce648be972e13f082f359397daa087763f76e32 100644 (file)
--- a/src/tom.cpp
+++ b/src/tom.cpp
@@ -576,7 +576,8 @@ void TOMFillLookupTables(void)
 //                     | ((i & 0x07C0) << 13) | ((i & 0x0700) << 8)
 //                     | ((i & 0x003F) << 10) | ((i & 0x0030) << 4);
                RGB16ToRGB32[i] = 0x000000FF
-                       | ((i & 0xF100) << 16)                                  // Red
+//                     | ((i & 0xF100) << 16)                                  // Red
+                       | ((i & 0xF800) << 16)                                  // Red
                        | ((i & 0x003F) << 18)                                  // Green
                        | ((i & 0x07C0) << 5);                                  // Blue
 
@@ -1648,7 +1649,7 @@ if (offset == MEMCON2)
 //if (offset == OBF)
 //     WriteLog("TOM: Object Processor Flag written by %s: %u\n", whoName[who], data);
 if (offset == VMODE)
-       WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC));
+       WriteLog("TOM: Video Mode written by %s: %04X. PWIDTH = %u, MODE = %s, flags:%s%s (VC = %u) (M68K PC = %06X)\n", whoName[who], data, ((data >> 9) & 0x07) + 1, videoMode_to_str[(data & MODE) >> 1], (data & BGEN ? " BGEN" : ""), (data & VARMOD ? " VARMOD" : ""), GET16(tomRam8, VC), m68k_get_reg(NULL, M68K_REG_PC));
 if (offset == BORD1)
        WriteLog("TOM: Border 1 written by %s: $%04X\n", whoName[who], data);
 if (offset == BORD2)