From 0fb249284f6f17d270ddde26f5f9ba93d0c4dd31 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 28 Mar 2016 16:08:42 +0200 Subject: [PATCH] debugger: initialized member CID 147003 CID 147004 --- pcsx2/DebugTools/DisassemblyManager.h | 15 ++++++++------- pcsx2/DebugTools/MipsAssembler.cpp | 6 ++++-- pcsx2/DebugTools/MipsAssembler.h | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pcsx2/DebugTools/DisassemblyManager.h b/pcsx2/DebugTools/DisassemblyManager.h index 9058b9f5f0..c2f0266a41 100644 --- a/pcsx2/DebugTools/DisassemblyManager.h +++ b/pcsx2/DebugTools/DisassemblyManager.h @@ -108,12 +108,13 @@ private: class DisassemblyMacro: public DisassemblyEntry { public: - DisassemblyMacro(DebugInterface* _cpu, u32 _address): cpu(_cpu), address(_address) { }; + DisassemblyMacro(DebugInterface* _cpu, u32 _address): + cpu(_cpu), type(MACRO_LI), name(), immediate(0), address(_address), numOpcodes(0), rt(0), dataSize(0) { }; virtual ~DisassemblyMacro() { }; - + void setMacroLi(u32 _immediate, u8 _rt); void setMacroMemory(std::string _name, u32 _immediate, u8 _rt, int _dataSize); - + virtual void recheck() { }; virtual int getNumLines() { return 1; }; virtual int getLineNum(u32 address, bool findStart) { return 0; }; @@ -122,7 +123,7 @@ public: virtual bool disassemble(u32 address, DisassemblyLineInfo& dest, bool insertSymbols) ; private: enum MacroType { MACRO_LI, MACRO_MEMORYIMM }; - + DebugInterface* cpu; MacroType type; std::string name; @@ -139,7 +140,7 @@ class DisassemblyData: public DisassemblyEntry public: DisassemblyData(DebugInterface* _cpu, u32 _address, u32 _size, DataType _type); virtual ~DisassemblyData() { }; - + virtual void recheck(); virtual int getNumLines() { return (int)lines.size(); }; virtual int getLineNum(u32 address, bool findStart); @@ -155,7 +156,7 @@ private: u32 size; int lineNum; }; - + DebugInterface* cpu; u32 address; u32 size; @@ -170,7 +171,7 @@ class DisassemblyComment: public DisassemblyEntry public: DisassemblyComment(DebugInterface* _cpu, u32 _address, u32 _size, std::string name, std::string param); virtual ~DisassemblyComment() { }; - + virtual void recheck() { }; virtual int getNumLines() { return 1; }; virtual int getLineNum(u32 address, bool findStart) { return 0; }; diff --git a/pcsx2/DebugTools/MipsAssembler.cpp b/pcsx2/DebugTools/MipsAssembler.cpp index 4fbf3b3cd7..ffcc5ed969 100644 --- a/pcsx2/DebugTools/MipsAssembler.cpp +++ b/pcsx2/DebugTools/MipsAssembler.cpp @@ -367,9 +367,11 @@ bool MipsCheckImmediate(const char* Source, DebugInterface* cpu, int& dest, int& return true; } -CMipsInstruction::CMipsInstruction(DebugInterface* cpu) +CMipsInstruction::CMipsInstruction(DebugInterface* cpu) : + Opcode(), NoCheckError(false), Loaded(false), RamPos(0), + registers(), immediateType(MIPS_NOIMMEDIATE), immediate(), + vfpuSize(0), encoding(0), error() { - Loaded = false; this->cpu = cpu; } diff --git a/pcsx2/DebugTools/MipsAssembler.h b/pcsx2/DebugTools/MipsAssembler.h index 01c7459826..b9230c51c0 100644 --- a/pcsx2/DebugTools/MipsAssembler.h +++ b/pcsx2/DebugTools/MipsAssembler.h @@ -43,11 +43,11 @@ struct MipsOpcodeRegisters { MipsRegisterInfo grs; // general source reg MipsRegisterInfo grt; // general target reg MipsRegisterInfo grd; // general dest reg - + MipsRegisterInfo frs; // float source reg MipsRegisterInfo frt; // float target reg MipsRegisterInfo frd; // float dest reg - + MipsRegisterInfo ps2vrs; // ps2 vector source reg MipsRegisterInfo ps2vrt; // ps2 vector target reg MipsRegisterInfo ps2vrd; // ps2 vector dest reg