Fixes for compilation against GCC 6.

[virtualjaguar] / src / blitter.cpp

diff --git a/src/blitter.cpp b/src/blitter.cpp
index c4975ab14a00618762cf6f26805822033331238c..7193daf19ca1cbaa26ebf80007a8b54dbfd6d83c 100644 (file)
--- a/src/blitter.cpp
+++ b/src/blitter.cpp
@@ -17,7 +17,6 @@
 // to Curt. ;-) Without that excellent documentation which shows *exactly*
 // what's going on inside the TOM chip, we'd all still be guessing as to how
 // the wily blitter and other pieces of the Jaguar puzzle actually work.
-// Now how about those JERRY ASIC nets gentlemen...? [We have those now!] ;-)
 //
 
 #include "blitter.h"
@@ -32,7 +31,7 @@
 
 // Various conditional compilation goodies...
 
-#define LOG_BLITS
+//#define LOG_BLITS
 
 #define USE_ORIGINAL_BLITTER
 //#define USE_MIDSUMMER_BLITTER
@@ -2774,7 +2773,7 @@ if (
 #else
 logBlit = true;
 #endif
-/*if (blit_start_log == 0)     // Wait for the signal...
+if (blit_start_log == 0)       // Wait for the signal...
        logBlit = false;//*/
 //temp, for testing...
 /*if (cmd != 0x49820609)
@@ -5388,7 +5387,7 @@ Addq_x            := JOIN (addq_x, addq_x[0..5], addqt_x[6..15]);
 Addq_y         := JOIN (addq_y, addq_y[0..15]);*/
 
 ////////////////////////////////////// C++ CODE //////////////////////////////////////
-       int16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
+       uint16_t mask[8] = { 0xFFFF, 0xFFFE, 0xFFFC, 0xFFF8, 0xFFF0, 0xFFE0, 0xFFC0, 0x0000 };
        addq_x = addqt_x & mask[modx];
        addq_y = addqt_y & 0xFFFF;
 //////////////////////////////////////////////////////////////////////////////////////