archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4310 from lioncash/dsptable

Browse source 
DSPRegisterView: Minor changes
This commit is contained in:
Markus Wick 2016-10-08 10:40:14 +02:00 committed by GitHub
commit 1a2d71cb58
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/DSP/DSPCore.cpp
View file

@ -331,7 +331,7 @@ void CompileCurrent()
} }
} }
u16 DSPCore_ReadRegister(int reg) u16 DSPCore_ReadRegister(size_t reg)
{ {
switch (reg) switch (reg)
{ {
@ -388,7 +388,7 @@ u16 DSPCore_ReadRegister(int reg)
} }
} }
void DSPCore_WriteRegister(int reg, u16 val) void DSPCore_WriteRegister(size_t reg, u16 val)
{ {
switch (reg) switch (reg)
{ {

5
Source/Core/Core/DSP/DSPCore.h
View file

@ -7,6 +7,7 @@
#include <array> #include <array>
#include <atomic> #include <atomic>
#include <cstddef>
#include <memory> #include <memory>
#include <string> #include <string>
@ -358,5 +359,5 @@ DSPCoreState DSPCore_GetState();
void DSPCore_Step(); void DSPCore_Step();
u16 DSPCore_ReadRegister(int reg); u16 DSPCore_ReadRegister(size_t reg);
void DSPCore_WriteRegister(int reg, u16 val); void DSPCore_WriteRegister(size_t reg, u16 val);

10
Source/Core/DolphinWX/Debugger/DSPRegisterView.cpp
View file

@ -13,7 +13,7 @@
wxString CDSPRegTable::GetValue(int row, int col) wxString CDSPRegTable::GetValue(int row, int col)
{ {
if (row < 32) // 32 "normal" regs if (row < GetNumberRows())
{ {
switch (col) switch (col)
{ {
@ -41,10 +41,12 @@ void CDSPRegTable::UpdateCachedRegs()
m_CachedCounter = g_dsp.step_counter; m_CachedCounter = g_dsp.step_counter;
for (int i = 0; i < 32; ++i) for (size_t i = 0; i < m_CachedRegs.size(); ++i)
{ {
m_CachedRegHasChanged[i] = (m_CachedRegs[i] != DSPCore_ReadRegister(i)); const u16 value = DSPCore_ReadRegister(i);
m_CachedRegs[i] = DSPCore_ReadRegister(i);
m_CachedRegHasChanged[i] = m_CachedRegs[i] != value;
m_CachedRegs[i] = value;
} }
} }

28
Source/Core/DolphinWX/Debugger/DSPRegisterView.h
View file

@ -4,26 +4,15 @@
#pragma once #pragma once
#include <cstring> #include <array>
#include <wx/grid.h> #include <wx/grid.h>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
class CDSPRegTable : public wxGridTableBase class CDSPRegTable final : public wxGridTableBase
{ {
private:
u64 m_CachedCounter;
u16 m_CachedRegs[32];
bool m_CachedRegHasChanged[32];
DECLARE_NO_COPY_CLASS(CDSPRegTable);
public: public:
CDSPRegTable() CDSPRegTable() = default;
{
memset(m_CachedRegs, 0, sizeof(m_CachedRegs));
memset(m_CachedRegHasChanged, 0, sizeof(m_CachedRegHasChanged));
}
int GetNumberCols() override { return 2; } int GetNumberCols() override { return 2; }
int GetNumberRows() override { return 32; } int GetNumberRows() override { return 32; }
@ -32,12 +21,19 @@ public:
void SetValue(int row, int col, const wxString&) override; void SetValue(int row, int col, const wxString&) override;
wxGridCellAttr* GetAttr(int, int, wxGridCellAttr::wxAttrKind) override; wxGridCellAttr* GetAttr(int, int, wxGridCellAttr::wxAttrKind) override;
void UpdateCachedRegs(); void UpdateCachedRegs();
private:
u64 m_CachedCounter = 0;
std::array<u16, 32> m_CachedRegs{};
std::array<bool, 32> m_CachedRegHasChanged{};
DECLARE_NO_COPY_CLASS(CDSPRegTable);
}; };
class DSPRegisterView : public wxGrid class DSPRegisterView final : public wxGrid
{ {
public: public:
DSPRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY); explicit DSPRegisterView(wxWindow* parent, wxWindowID id = wxID_ANY);
void Repopulate(); void Repopulate();
private: private: