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

Merge pull request #2219 from magumagu/no-volatile-processorinterface 

Remove useless volatile from ProcessorInterface.
This commit is contained in:
shuffle2 2015-03-16 11:34:13 -07:00
parent c73cac3ee9 fd15cad1ca
commit 0b6562b53f
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/Core/HW/ProcessorInterface.cpp
View File

@ -4,7 +4,6 @@
#include <cstdio>
#include "Common/Atomic.h"
#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
@ -37,8 +36,8 @@ enum
// STATE_TO_SAVE
volatile u32 m_InterruptCause;
volatile u32 m_InterruptMask;
u32 m_InterruptCause;
u32 m_InterruptMask;
// addresses for CPU fifo accesses
u32 Fifo_CPUBase;
u32 Fifo_CPUEnd;
@ -98,7 +97,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
mmio->Register(base | PI_INTERRUPT_CAUSE,
MMIO::DirectRead<u32>(&m_InterruptCause),
MMIO::ComplexWrite<u32>([](u32, u32 val) {
Common::AtomicAnd(m_InterruptCause, ~val);
m_InterruptCause &= ~val;
UpdateException();
})
);
@ -204,20 +203,17 @@ void SetInterrupt(u32 _causemask, bool _bSet)
}
if (_bSet)
Common::AtomicOr(m_InterruptCause, _causemask);
m_InterruptCause |= _causemask;
else
Common::AtomicAnd(m_InterruptCause, ~_causemask);// is there any reason to have this possibility?
// F|RES: i think the hw devices reset the interrupt in the PI to 0
// if the interrupt cause is eliminated. that isnt done by software (afaik)
m_InterruptCause &= ~_causemask;// is there any reason to have this possibility?
// F|RES: i think the hw devices reset the interrupt in the PI to 0
// if the interrupt cause is eliminated. that isnt done by software (afaik)
UpdateException();
}
static void SetResetButton(bool _bSet)
{
if (_bSet)
Common::AtomicAnd(m_InterruptCause, ~INT_CAUSE_RST_BUTTON);
else
Common::AtomicOr(m_InterruptCause, INT_CAUSE_RST_BUTTON);
SetInterrupt(INT_CAUSE_RST_BUTTON, !_bSet);
}
void ToggleResetButtonCallback(u64 userdata, int cyclesLate)

4
Source/Core/Core/HW/ProcessorInterface.h
View File

@ -35,8 +35,8 @@ enum InterruptCause
};
extern volatile u32 m_InterruptCause;
extern volatile u32 m_InterruptMask;
extern u32 m_InterruptCause;
extern u32 m_InterruptMask;
extern u32 Fifo_CPUBase;
extern u32 Fifo_CPUEnd;
extern u32 Fifo_CPUWritePointer;