From d9b23f0b755f7e9ae2189dd8c741a2342a58a061 Mon Sep 17 00:00:00 2001 From: Robert Date: Sat, 28 Jan 2023 01:51:18 +0100 Subject: [PATCH] fix warning in debugger module --- src/CMakeLists.txt | 2 +- src/debugger/Debugger.cpp | 2 ++ src/debugger/Disassembler.cpp | 2 +- src/debugger/MemoryViewer.cpp | 6 +++--- src/debugger/NametableViewer.cpp | 4 ++-- src/debugger/PPUWatcher.cpp | 16 ++++++++-------- src/debugger/Palettes.cpp | 4 ++-- src/debugger/PatternTableViewer.cpp | 10 +++++----- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40a4015..593c13c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,7 @@ target_link_libraries(nesemu ) if (WIN32) - target_compile_options(nesemu PRIVATE "/W4" "/WX") + target_compile_options(nesemu PRIVATE "/W4" "/WX" "/wd4996") else() target_compile_options(nesemu PRIVATE "-Wall" "-Werror") endif() diff --git a/src/debugger/Debugger.cpp b/src/debugger/Debugger.cpp index 9a31bad..772911d 100644 --- a/src/debugger/Debugger.cpp +++ b/src/debugger/Debugger.cpp @@ -60,6 +60,8 @@ bool Debugger::Frame() bus->cpu.Halt(); return true; } + + return false; } bool Debugger::Update() diff --git a/src/debugger/Disassembler.cpp b/src/debugger/Disassembler.cpp index 51f9e8a..74378fb 100644 --- a/src/debugger/Disassembler.cpp +++ b/src/debugger/Disassembler.cpp @@ -106,7 +106,7 @@ void Disassembler::Disassemble(std::string& target, uint16_t pc, const Instructi std::stringstream ss; ss << FORMAT << pc << ": "; - for (int i = 0; i < instr->Size; i++) + for (uint8_t i = 0; i < instr->Size; i++) { ss << FORMAT << std::setw(2) << (Word)cpu->Read(pc + i) << " "; } diff --git a/src/debugger/MemoryViewer.cpp b/src/debugger/MemoryViewer.cpp index 9f4432a..b5a9203 100644 --- a/src/debugger/MemoryViewer.cpp +++ b/src/debugger/MemoryViewer.cpp @@ -22,9 +22,9 @@ void MemoryViewer::OnRender() for (Byte page = 0; page < 8; page++) { - char title[7]; - std::sprintf(title, "Page %d", page); - if (ImGui::BeginTabItem(title)) + char tab_title[7]; + std::sprintf(tab_title, "Page %d", page); + if (ImGui::BeginTabItem(tab_title)) { DrawPage(page); ImGui::EndTabItem(); diff --git a/src/debugger/NametableViewer.cpp b/src/debugger/NametableViewer.cpp index b36a0bc..9311ef7 100644 --- a/src/debugger/NametableViewer.cpp +++ b/src/debugger/NametableViewer.cpp @@ -87,7 +87,7 @@ void NametableViewer::OnRender() if (smallerSize < 40.0f) smallerSize = 40.0f; - ImGui::Image((ImTextureID)texture, ImVec2{smallerSize, smallerSize - 20.0f}); + ImGui::Image(reinterpret_cast((uint64_t)texture), ImVec2{smallerSize, smallerSize - 20.0f}); ImGui::End(); } @@ -104,7 +104,7 @@ void NametableViewer::OnRender() if (smallerSize < 40.0f) smallerSize = 40.0f; - ImGui::Image((ImTextureID)attributeTexture, ImVec2{ smallerSize, smallerSize - 20.0f }); + ImGui::Image(reinterpret_cast((uint64_t)attributeTexture), ImVec2{ smallerSize, smallerSize - 20.0f }); ImGui::End(); } diff --git a/src/debugger/PPUWatcher.cpp b/src/debugger/PPUWatcher.cpp index 3176134..d3de1f0 100644 --- a/src/debugger/PPUWatcher.cpp +++ b/src/debugger/PPUWatcher.cpp @@ -56,10 +56,10 @@ void PPUWatcher::OnRender() ImGui::Text("Current VRAM Address (v) : %02X ($%04X)", ppu->current.Raw, 0x2000 | (ppu->current.Raw & 0x0FFF)); if (ImGui::TreeNode("Breakdown (v)")) { - ImGui::Text("Coarse X : %02X", ppu->current.CoarseX); - ImGui::Text("Coarse Y : %02X", ppu->current.CoarseY); - ImGui::Text("Nametable: %02X", ppu->current.NametableSel); - ImGui::Text("Fine Y : %02X", ppu->current.FineY); + ImGui::Text("Coarse X : %02X", ppu->current.Data.CoarseX); + ImGui::Text("Coarse Y : %02X", ppu->current.Data.CoarseY); + ImGui::Text("Nametable: %02X", ppu->current.Data.NametableSel); + ImGui::Text("Fine Y : %02X", ppu->current.Data.FineY); ImGui::TreePop(); } @@ -67,10 +67,10 @@ void PPUWatcher::OnRender() ImGui::Text("Temporary VRAM Address (t): %02X ($%04X)", ppu->temporary.Raw, 0x2000 | (ppu->current.Raw & 0x0FFF)); if (ImGui::TreeNode("Breakdown (t)")) { - ImGui::Text("Coarse X : %02X", ppu->temporary.CoarseX); - ImGui::Text("Coarse Y : %02X", ppu->temporary.CoarseY); - ImGui::Text("Nametable: %02X", ppu->temporary.NametableSel); - ImGui::Text("Fine Y : %02X", ppu->temporary.FineY); + ImGui::Text("Coarse X : %02X", ppu->temporary.Data.CoarseX); + ImGui::Text("Coarse Y : %02X", ppu->temporary.Data.CoarseY); + ImGui::Text("Nametable: %02X", ppu->temporary.Data.NametableSel); + ImGui::Text("Fine Y : %02X", ppu->temporary.Data.FineY); ImGui::TreePop(); } diff --git a/src/debugger/Palettes.cpp b/src/debugger/Palettes.cpp index 2e460b7..006916d 100644 --- a/src/debugger/Palettes.cpp +++ b/src/debugger/Palettes.cpp @@ -56,7 +56,7 @@ void Palettes::OnRender() glTextureSubImage2D(backgroundPalettes, 0, 0, 0, 4, 4, GL_RGB, GL_UNSIGNED_BYTE, (const void*)palette); for(float i = 0; i < 1.0f; i += 0.25f) - ImGui::Image((ImTextureID)backgroundPalettes, size, ImVec2(0, i), ImVec2(1, i + 0.25f)); + ImGui::Image(reinterpret_cast((uint64_t)backgroundPalettes), size, ImVec2(0, i), ImVec2(1, i + 0.25f)); } if (ImGui::CollapsingHeader("Sprites")) @@ -72,7 +72,7 @@ void Palettes::OnRender() glTextureSubImage2D(spritePalettes, 0, 0, 0, 4, 4, GL_RGB, GL_UNSIGNED_BYTE, (const void*)palette); for (float i = 0; i < 1.0f; i += 0.25f) - ImGui::Image((ImTextureID)spritePalettes, size, ImVec2(0, i), ImVec2(1, i + 0.25f)); + ImGui::Image(reinterpret_cast((uint64_t)spritePalettes), size, ImVec2(0, i), ImVec2(1, i + 0.25f)); } ImGui::End(); diff --git a/src/debugger/PatternTableViewer.cpp b/src/debugger/PatternTableViewer.cpp index bbf4ec4..d21f0a7 100644 --- a/src/debugger/PatternTableViewer.cpp +++ b/src/debugger/PatternTableViewer.cpp @@ -42,13 +42,13 @@ void PatternTableViewer::OnRender() { if (ImGui::BeginTabItem("Table 1")) { - ImGui::Image((ImTextureID)texture, ImVec2(smallerSize, smallerSize - 40.0f), ImVec2(0.0f, 0.0f), ImVec2(0.5f, 1.0f)); + ImGui::Image(reinterpret_cast((uint64_t)texture), ImVec2(smallerSize, smallerSize - 40.0f), ImVec2(0.0f, 0.0f), ImVec2(0.5f, 1.0f)); ImGui::EndTabItem(); } if (ImGui::BeginTabItem("Table 2")) { - ImGui::Image((ImTextureID)texture, ImVec2(smallerSize, smallerSize - 40.0f), ImVec2(0.5f, 0.0f), ImVec2(1.0f, 1.0f)); + ImGui::Image(reinterpret_cast((uint64_t)texture), ImVec2(smallerSize, smallerSize - 40.0f), ImVec2(0.5f, 0.0f), ImVec2(1.0f, 1.0f)); ImGui::EndTabItem(); } @@ -62,13 +62,13 @@ void PatternTableViewer::OnRender() void PatternTableViewer::DecodePatternTable(int index, std::vector& buffer) { // uint8_t stride = 128; - Word baseAddr = 0x1000 * index; + Word baseAddr = (Word)(0x1000 * index); if (baseAddr >= mapper->CHR_ROM.size()) return; - for (int y = 0; y < 16; y++) + for (uint8_t y = 0; y < 16; y++) { - for (int x = 0; x < 16; x++) + for (uint8_t x = 0; x < 16; x++) { Word tileAddress = baseAddr + (16 * 16 * y) + (16 * x);