mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 18:33:24 +02:00
Merge pull request #679 from lioncash/const
disassembler: Get rid of a const_cast
This commit is contained in:
commit
bd7798f94b
@ -232,11 +232,8 @@ void DisassemblerWidget::OnDebugModeEntered()
|
||||
{
|
||||
ARMword next_instr = Core::g_app_core->GetPC();
|
||||
|
||||
// TODO: Make BreakPoints less crappy (i.e. const-correct) so that this doesn't need a const_cast.
|
||||
if (const_cast<BreakPoints&>(model->GetBreakPoints()).IsAddressBreakPoint(next_instr))
|
||||
{
|
||||
if (model->GetBreakPoints().IsAddressBreakPoint(next_instr))
|
||||
emu_thread.SetCpuRunning(false);
|
||||
}
|
||||
|
||||
model->SetNextInstruction(next_instr);
|
||||
|
||||
|
@ -10,14 +10,14 @@
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
|
||||
bool BreakPoints::IsAddressBreakPoint(u32 iAddress)
|
||||
bool BreakPoints::IsAddressBreakPoint(u32 iAddress) const
|
||||
{
|
||||
auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress; };
|
||||
auto it = std::find_if(m_BreakPoints.begin(), m_BreakPoints.end(), cond);
|
||||
return it != m_BreakPoints.end();
|
||||
}
|
||||
|
||||
bool BreakPoints::IsTempBreakPoint(u32 iAddress)
|
||||
bool BreakPoints::IsTempBreakPoint(u32 iAddress) const
|
||||
{
|
||||
auto cond = [&iAddress](const TBreakPoint& bp) { return bp.iAddress == iAddress && bp.bTemporary; };
|
||||
auto it = std::find_if(m_BreakPoints.begin(), m_BreakPoints.end(), cond);
|
||||
|
@ -56,8 +56,8 @@ public:
|
||||
void AddFromStrings(const TBreakPointsStr& bps);
|
||||
|
||||
// is address breakpoint
|
||||
bool IsAddressBreakPoint(u32 iAddress);
|
||||
bool IsTempBreakPoint(u32 iAddress);
|
||||
bool IsAddressBreakPoint(u32 iAddress) const;
|
||||
bool IsTempBreakPoint(u32 iAddress) const;
|
||||
|
||||
// Add BreakPoint
|
||||
void Add(u32 em_address, bool temp=false);
|
||||
|
Loading…
Reference in New Issue
Block a user