ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

debugger: properly init DisassemblyLineInfo 

Avoid conditinal check on uninitialized value (reported by Valgrind)
This commit is contained in:
Gregory Hainaut 2016-04-07 09:25:43 +02:00
parent 0ab7b6340d
commit 5736b5e9eb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/DebugTools/DisassemblyManager.h
View File

@ -30,6 +30,8 @@ struct DisassemblyLineInfo
std::string name; std::string name;
std::string params; std::string params;
u32 totalSize; u32 totalSize;
DisassemblyLineInfo() : type(DISTYPE_OTHER), info(), name(), params(), totalSize() {}
}; };
enum LineType { LINE_UP, LINE_DOWN }; enum LineType { LINE_UP, LINE_DOWN };

12
pcsx2/gui/Debugger/CtrlDisassemblyView.cpp
View File

@ -383,7 +383,7 @@ int getBackgroundColor(unsigned int address)
std::set<std::string> CtrlDisassemblyView::getSelectedLineArguments() { std::set<std::string> CtrlDisassemblyView::getSelectedLineArguments() {
std::set<std::string> args; std::set<std::string> args;
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
for (u32 addr = selectRangeStart; addr < selectRangeEnd; addr += 4) { for (u32 addr = selectRangeStart; addr < selectRangeEnd; addr += 4) {
manager.getLine(addr, displaySymbols, line); manager.getLine(addr, displaySymbols, line);
size_t p = 0, nextp = line.params.find(','); size_t p = 0, nextp = line.params.find(',');
@ -489,7 +489,7 @@ void CtrlDisassemblyView::render(wxDC& dc)
unsigned int address = windowStart; unsigned int address = windowStart;
const std::set<std::string> currentArguments = getSelectedLineArguments(); const std::set<std::string> currentArguments = getSelectedLineArguments();
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
for (int i = 0; i < visibleRows+1; i++) for (int i = 0; i < visibleRows+1; i++)
{ {
manager.getLine(address,displaySymbols,line); manager.getLine(address,displaySymbols,line);
@ -603,7 +603,7 @@ void CtrlDisassemblyView::calculatePixelPositions()
void CtrlDisassemblyView::followBranch() void CtrlDisassemblyView::followBranch()
{ {
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
manager.getLine(curAddress,true,line); manager.getLine(curAddress,true,line);
if (line.type == DISTYPE_OPCODE || line.type == DISTYPE_MACRO) if (line.type == DISTYPE_OPCODE || line.type == DISTYPE_MACRO)
@ -966,7 +966,7 @@ void CtrlDisassemblyView::toggleBreakpoint(bool toggleEnabled)
void CtrlDisassemblyView::updateStatusBarText() void CtrlDisassemblyView::updateStatusBarText()
{ {
char text[512]; char text[512];
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
manager.getLine(curAddress,true,line); manager.getLine(curAddress,true,line);
text[0] = 0; text[0] = 0;
@ -1175,7 +1175,7 @@ std::string CtrlDisassemblyView::disassembleRange(u32 start, u32 size)
u32 disAddress = start; u32 disAddress = start;
bool previousLabel = true; bool previousLabel = true;
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
while (disAddress < start+size) while (disAddress < start+size)
{ {
char addressText[64],buffer[512]; char addressText[64],buffer[512];
@ -1293,7 +1293,7 @@ void CtrlDisassemblyView::editBreakpoint()
void CtrlDisassemblyView::getOpcodeText(u32 address, char* dest) void CtrlDisassemblyView::getOpcodeText(u32 address, char* dest)
{ {
DisassemblyLineInfo line; DisassemblyLineInfo line = DisassemblyLineInfo();
address = manager.getStartAddress(address); address = manager.getStartAddress(address);
manager.getLine(address,displaySymbols,line); manager.getLine(address,displaySymbols,line);
sprintf(dest,"%s %s",line.name.c_str(),line.params.c_str()); sprintf(dest,"%s %s",line.name.c_str(),line.params.c_str());