From 053fddfca7f793795787542c8cb11f28a725b467 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 29 Jun 2013 10:59:42 -0700 Subject: [PATCH] Fix some sign comparison warnings. --- Windows/Debugger/CtrlDisAsmView.cpp | 6 +++--- Windows/Debugger/CtrlDisAsmView.h | 6 +++--- Windows/Debugger/CtrlMemView.cpp | 4 ++-- Windows/Debugger/Debugger_Disasm.cpp | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Windows/Debugger/CtrlDisAsmView.cpp b/Windows/Debugger/CtrlDisAsmView.cpp index 0dd72a1f0f..0cf750dd48 100644 --- a/Windows/Debugger/CtrlDisAsmView.cpp +++ b/Windows/Debugger/CtrlDisAsmView.cpp @@ -846,7 +846,7 @@ void CtrlDisAsmView::disassembleToFile() // gather all branch targets without labels std::set branchAddresses; - for (int i = 0; i < size; i += instructionSize) + for (u32 i = 0; i < size; i += instructionSize) { char opcode[64],arguments[256]; const char *dis = debugger->disasm(curAddress+i, instructionSize); @@ -862,7 +862,7 @@ void CtrlDisAsmView::disassembleToFile() } bool previousLabel = true; - for (int i = 0; i < size; i += instructionSize) + for (u32 i = 0; i < size; i += instructionSize) { u32 disAddress = curAddress+i; @@ -897,7 +897,7 @@ void CtrlDisAsmView::disassembleToFile() void CtrlDisAsmView::getOpcodeText(u32 address, char* dest) { - char addressText[64],opcode[64],arguments[256]; + char opcode[64],arguments[256]; const char *dis = debugger->disasm(address, instructionSize); parseDisasm(dis,opcode,arguments); diff --git a/Windows/Debugger/CtrlDisAsmView.h b/Windows/Debugger/CtrlDisAsmView.h index eab8143532..7baba66494 100644 --- a/Windows/Debugger/CtrlDisAsmView.h +++ b/Windows/Debugger/CtrlDisAsmView.h @@ -30,7 +30,7 @@ class CtrlDisAsmView HFONT boldfont; RECT rect; - int curAddress; + u32 curAddress; int rowHeight; bool hasFocus; @@ -38,7 +38,7 @@ class CtrlDisAsmView DebugInterface *debugger; static TCHAR szClassName[]; - int windowStart; + u32 windowStart; int visibleRows; int instructionSize; bool whiteBackground; @@ -115,7 +115,7 @@ public: { gotoAddr(debugger->getPC()&(~(instructionSize-1))); } - unsigned int getSelection() + u32 getSelection() { return curAddress; } diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp index 7927d3ad26..8b80e61f94 100644 --- a/Windows/Debugger/CtrlMemView.cpp +++ b/Windows/Debugger/CtrlMemView.cpp @@ -512,7 +512,7 @@ void CtrlMemView::gotoPoint(int x, int y) void CtrlMemView::gotoAddr(unsigned int addr) { int lines=(rect.bottom/rowHeight); - int windowEnd = windowStart+lines*rowSize; + u32 windowEnd = windowStart+lines*rowSize; curAddress = addr; selectedNibble = 0; @@ -555,7 +555,7 @@ void CtrlMemView::scrollCursor(int bytes) curAddress += bytes; - int windowEnd = windowStart+visibleRows*rowSize; + u32 windowEnd = windowStart+visibleRows*rowSize; if (curAddress < windowStart) { windowStart = curAddress & ~15; diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp index 07c1a3937d..7e1367d187 100644 --- a/Windows/Debugger/Debugger_Disasm.cpp +++ b/Windows/Debugger/Debugger_Disasm.cpp @@ -191,7 +191,7 @@ CDisasm::~CDisasm() int getTotalBreakpointCount() { - int count = CBreakPoints::MemChecks.size(); + int count = (int)CBreakPoints::MemChecks.size(); for (int i = 0; i < CBreakPoints::GetNumBreakpoints(); i++) { if (!CBreakPoints::GetBreakpoint(i).bTemporary) count++; @@ -239,7 +239,7 @@ int getBreakpointIndex(int itemIndex, bool& isMemory) return itemIndex; } - itemIndex -= CBreakPoints::MemChecks.size(); + itemIndex -= (int)CBreakPoints::MemChecks.size(); int i = 0; while (i < CBreakPoints::GetNumBreakpoints())