| [PATCH 20/20] Silence compiler warnings reported by Clang |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- Subject: [PATCH 20/20] Silence compiler warnings reported by Clang
- From: Thomas Huth <huth@xxxxxxxxxxxxx>
- Date: Fri, 29 Mar 2024 12:28:04 +0100
---
CMakeLists.txt | 16 +++++++-------
src/jaguar/cdrom.c | 27 +++++------------------
src/jaguar/gpu.c | 2 +-
src/jaguar/objectp.c | 26 +++++++++++-----------
src/jaguar/tom.c | 52 ++++++++++++++++++++++----------------------
5 files changed, 54 insertions(+), 69 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5591d918..073a98e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,14 +289,14 @@ if(EMSCRIPTEN)
set(CMAKE_EXECUTABLE_SUFFIX ".html")
endif()
-if(ENABLE_WERROR)
- if (ENABLE_TRACING)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
- else()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wno-error=unused-function")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable")
- endif()
-endif(ENABLE_WERROR)
+#if(ENABLE_WERROR)
+# if (ENABLE_TRACING)
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+# else()
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wno-error=unused-function")
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-but-set-variable")
+# endif()
+#endif(ENABLE_WERROR)
# Building Hatari w/o optimization is no fun...
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/src/jaguar/cdrom.c b/src/jaguar/cdrom.c
index 4dc48c00..47d9dff0 100644
--- a/src/jaguar/cdrom.c
+++ b/src/jaguar/cdrom.c
@@ -822,13 +822,9 @@ WriteLog("CDROM: %s reading block #%u...\n", whoName[who], block);
block++, cdBufPtr = 0;
}
-/*extern bool doDSPDis;
-if (block == 244968)
- doDSPDis = true;//*/
-
-WriteLog("[%04X:%01X]", GET16(cdBuf, cdBufPtr), offset & 0x0F);
-if (cdBufPtr % 32 == 30)
- WriteLog("\n");
+ WriteLog("[%04X:%01X]", GET16(cdBuf, cdBufPtr), offset & 0x0F);
+ if (cdBufPtr % 32 == 30)
+ WriteLog("\n");
// return GET16(cdBuf, cdBufPtr);
//This probably isn't endian safe...
@@ -889,22 +885,11 @@ WriteLog("CDROM: Reading block #%u...\n", block);
cdBuf[2351] = cdBuf3[1];//*/
block++, cdBufPtr = 0;
-
-/*extern bool doDSPDis;
-static int foo = 0;
-if (block == 244968)
-{
- foo++;
-WriteLog("\n***** foo = %u, block = %u *****\n\n", foo, block);
- if (foo == 2)
- doDSPDis = true;
-}//*/
}
-
-WriteLog("[%02X%02X %02X%02X]", cdBuf[cdBufPtr+1], cdBuf[cdBufPtr+0], cdBuf[cdBufPtr+3], cdBuf[cdBufPtr+2]);
-if (cdBufPtr % 32 == 28)
- WriteLog("\n");
+ WriteLog("[%02X%02X %02X%02X]", cdBuf[cdBufPtr+1], cdBuf[cdBufPtr+0], cdBuf[cdBufPtr+3], cdBuf[cdBufPtr+2]);
+ if (cdBufPtr % 32 == 28)
+ WriteLog("\n");
//This probably isn't endian safe...
// But then again... It seems that even though the data on the CD is organized as
diff --git a/src/jaguar/gpu.c b/src/jaguar/gpu.c
index b310c6f0..43e41b9f 100644
--- a/src/jaguar/gpu.c
+++ b/src/jaguar/gpu.c
@@ -649,7 +649,7 @@ void GPUWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
}
return;
}
- else if ((offset == GPU_WORK_RAM_BASE + 0x0FFF) || (GPU_CONTROL_RAM_BASE + 0x1F))
+ else if (offset == GPU_WORK_RAM_BASE + 0x0FFF || offset == GPU_CONTROL_RAM_BASE + 0x1F)
{
#ifdef GPU_DEBUG
WriteLog("GPU: Write16--unaligned write @ %08X by %s [%04X]!\n", offset, whoName[who], data);
diff --git a/src/jaguar/objectp.c b/src/jaguar/objectp.c
index 0ca9a631..4e3345d4 100644
--- a/src/jaguar/objectp.c
+++ b/src/jaguar/objectp.c
@@ -447,10 +447,10 @@ WriteLog(" --> List end\n");
uint32 height = (p0 & 0xFFC000) >> 14;
uint32 oldOPP = op_pointer - 8;
// *** BEGIN OP PROCESSOR TESTING ONLY ***
-if (inhibit && op_start_log)
- WriteLog("!!! ^^^ This object is INHIBITED! ^^^ !!!\n");
-bitmapCounter++;
-if (!inhibit) // For OP testing only!
+ if (inhibit && op_start_log)
+ WriteLog("!!! ^^^ This object is INHIBITED! ^^^ !!!\n");
+ bitmapCounter++;
+ //if (!inhibit) // For OP testing only!
// *** END OP PROCESSOR TESTING ONLY ***
if (scanline >= ypos && height > 0)
{
@@ -504,13 +504,13 @@ if (!inhibit) // For OP testing only!
uint32 height = (p0 & 0xFFC000) >> 14;
uint32 oldOPP = op_pointer - 8;
// *** BEGIN OP PROCESSOR TESTING ONLY ***
-if (inhibit && op_start_log)
-{
- WriteLog("!!! ^^^ This object is INHIBITED! ^^^ !!! (scanline=%u, ypos=%u, height=%u)\n", scanline, ypos, height);
- DumpScaledObject(p0, OPLoadPhrase(op_pointer), OPLoadPhrase(op_pointer+8));
-}
-bitmapCounter++;
-if (!inhibit) // For OP testing only!
+ if (inhibit && op_start_log)
+ {
+ WriteLog("!!! ^^^ This object is INHIBITED! ^^^ !!! (scanline=%u, ypos=%u, height=%u)\n", scanline, ypos, height);
+ DumpScaledObject(p0, OPLoadPhrase(op_pointer), OPLoadPhrase(op_pointer+8));
+ }
+ bitmapCounter++;
+ // if (!inhibit) // For OP testing only!
// *** END OP PROCESSOR TESTING ONLY ***
if (scanline >= ypos && height > 0)
{
@@ -1137,8 +1137,8 @@ void OPProcessScaledBitmap(uint64 p0, uint64 p1, uint64 p2, bool render)
//Use the upper bits as an offset into the phrase depending on the BPP. That's how!
uint32 firstPix = (p1 >> 49) & 0x3F;
//This is WEIRD! I'm sure I saw Atari Karts request 8 BPP FIRSTPIX! What happened???
-if (firstPix)
- WriteLog("OP: FIRSTPIX != 0! (Scaled BM)\n");
+ if (firstPix)
+ WriteLog("OP: FIRSTPIX != 0! (Scaled BM)\n");
//#endif
// We can ignore the RELEASE (high order) bit for now--probably forever...!
// uint8 flags = (p1 >> 45) & 0x0F; // REFLECT, RMW, TRANS, RELEASE
diff --git a/src/jaguar/tom.c b/src/jaguar/tom.c
index a1a70d23..296e5063 100644
--- a/src/jaguar/tom.c
+++ b/src/jaguar/tom.c
@@ -1270,32 +1270,32 @@ void TOMWriteWord(uint32 offset, uint16 data, uint32 who/*=UNKNOWN*/)
TOMWriteByte(offset, data >> 8, who);
TOMWriteByte(offset+1, data & 0xFF, who);
-if (offset == VDB)
- WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data);
-if (offset == VDE)
- WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data);
-if (offset == VP)
- WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : ""));
-if (offset == HDB1)
- WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data);
-if (offset == HDE)
- WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data);
-if (offset == HP)
- WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2);
-if (offset == VBB)
- WriteLog("TOM: Vertical Blank Begin written by %s: %u\n", whoName[who], data);
-if (offset == VBE)
- WriteLog("TOM: Vertical Blank End written by %s: %u\n", whoName[who], data);
-if (offset == VS)
- WriteLog("TOM: Vertical Sync written by %s: %u\n", whoName[who], data);
-if (offset == VI)
- WriteLog("TOM: Vertical Interrupt written by %s: %u\n", whoName[who], data);
-if (offset == HBB)
- WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data);
-if (offset == HBE)
- WriteLog("TOM: Horizontal Blank End 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));
+ if (offset == VDB)
+ WriteLog("TOM: Vertical Display Begin written by %s: %u\n", whoName[who], data);
+ if (offset == VDE)
+ WriteLog("TOM: Vertical Display End written by %s: %u\n", whoName[who], data);
+ if (offset == VP)
+ WriteLog("TOM: Vertical Period written by %s: %u (%sinterlaced)\n", whoName[who], data, (data & 0x01 ? "non-" : ""));
+ if (offset == HDB1)
+ WriteLog("TOM: Horizontal Display Begin 1 written by %s: %u\n", whoName[who], data);
+ if (offset == HDE)
+ WriteLog("TOM: Horizontal Display End written by %s: %u\n", whoName[who], data);
+ if (offset == HP)
+ WriteLog("TOM: Horizontal Period written by %s: %u (+1*2 = %u)\n", whoName[who], data, (data + 1) * 2);
+ if (offset == VBB)
+ WriteLog("TOM: Vertical Blank Begin written by %s: %u\n", whoName[who], data);
+ if (offset == VBE)
+ WriteLog("TOM: Vertical Blank End written by %s: %u\n", whoName[who], data);
+ if (offset == VS)
+ WriteLog("TOM: Vertical Sync written by %s: %u\n", whoName[who], data);
+ if (offset == VI)
+ WriteLog("TOM: Vertical Interrupt written by %s: %u\n", whoName[who], data);
+ if (offset == HBB)
+ WriteLog("TOM: Horizontal Blank Begin written by %s: %u\n", whoName[who], data);
+ if (offset == HBE)
+ WriteLog("TOM: Horizontal Blank End 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));
// detect screen resolution changes
//This may go away in the future, if we do the virtualized screen thing...
--
2.48.1
--MP_/VkVZp1l8MIESxWVe2vPSxV2--