lauchmelder/NESemu
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix warning in debugger module

Browse source
This commit is contained in:
Robert 2023-01-28 01:51:18 +01:00
parent 0c6d5f65a5
commit d9b23f0b75
8 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -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()

2
src/debugger/Debugger.cpp
View file

@ -60,6 +60,8 @@ bool Debugger::Frame()
bus->cpu.Halt();
return true;
}
return false;
}
bool Debugger::Update()

2
src/debugger/Disassembler.cpp
View file

@ -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) << " ";
}

6
src/debugger/MemoryViewer.cpp
View file

@ -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();

4
src/debugger/NametableViewer.cpp
View file

@ -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<ImTextureID>((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<ImTextureID>((uint64_t)attributeTexture), ImVec2{ smallerSize, smallerSize - 20.0f });
ImGui::End();
}

16
src/debugger/PPUWatcher.cpp
View file

@ -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();
}

4
src/debugger/Palettes.cpp
View file

@ -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<ImTextureID>((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<ImTextureID>((uint64_t)spritePalettes), size, ImVec2(0, i), ImVec2(1, i + 0.25f));
}
ImGui::End();

10
src/debugger/PatternTableViewer.cpp
View file

@ -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<ImTextureID>((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<ImTextureID>((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<Color>& 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);