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 #1436 from phire/DumbGetPointers 

Remove some dumb GetPointers.
This commit is contained in:
Ryan Houdek 2014-10-30 12:59:09 -06:00
parent 3e82cb4628 b4e0328508
commit 1ac9008243
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/DSP.cpp
View File

@ -241,7 +241,7 @@ void Init(bool hle)
g_ARAM.wii_mode = true;
g_ARAM.size = Memory::EXRAM_SIZE;
g_ARAM.mask = Memory::EXRAM_MASK;
g_ARAM.ptr = Memory::GetPointer(0x10000000);
g_ARAM.ptr = Memory::m_pEXRAM;
}
else
{

6
Source/Core/Core/HW/DSPHLE/UCodes/ZeldaVoice.cpp
View File

@ -438,7 +438,7 @@ void ZeldaUCode::RenderVoice_Raw(ZeldaVoicePB &PB, s16 *_Buffer, int _Size)
Decoder21_ReadAudio(PB, _RealSize, _Buffer);
}
void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer)
void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16* _Buffer)
{
// 0af6
if (!size)
@ -461,9 +461,7 @@ void Decoder21_ReadAudio(ZeldaVoicePB &PB, int size, s16 *_Buffer)
// ACC0 is the address
// ACC1 is the read size
const u32 ram_mask = 0x1FFFFFF;
const u8 *source = Memory::GetPointer(0x80000000);
const u16 *src = (u16 *)(source + (ACC0 & ram_mask));
const u16* src = (u16*) Memory::GetPointer(ACC0 & Memory::RAM_MASK);
for (u32 i = 0; i < (ACC1 >> 16); i++)
{

2
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View File

@ -168,7 +168,7 @@ bool DSPLLE::Initialize(bool bWii, bool bDSPThread)
if (!DSPCore_Init(opts))
return false;
g_dsp.cpu_ram = Memory::GetPointer(0);
g_dsp.cpu_ram = Memory::m_pRAM;
DSPCore_Reset();
m_bIsRunning = true;

4
Source/Core/Core/HW/MemmapFunctions.cpp
View File

@ -811,7 +811,9 @@ static u32 TranslatePageAddress(const u32 _Address, const XCheckTLBFlag _Flag)
u32 VSID = SR_VSID(sr); // 24 bit
u32 api = EA_API(_Address); // 6 bit (part of page_index)
u8* pRAM = GetPointer(0);
// Direct access to the fastmem Arena
// FIXME: is this the best idea for clean code?
u8* pRAM = Memory::base;
// hash function no 1 "xor" .360
u32 hash1 = (VSID ^ page_index);

4
Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp
View File

@ -126,7 +126,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent)
void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED (event))
{
const u8* const memptr = Memory::GetPointer(0);
const u8* const memptr = Memory::m_pRAM;
if (memptr == nullptr)
{
WxUtils::ShowErrorDialog(_("A game is not currently running."));
@ -158,7 +158,7 @@ void CheatSearchTab::StartNewSearch(wxCommandEvent& WXUNUSED (event))
void CheatSearchTab::FilterCheatSearchResults(wxCommandEvent&)
{
const u8* const memptr = Memory::GetPointer(0);
const u8* const memptr = Memory::m_pRAM;
if (memptr == nullptr)
{
WxUtils::ShowErrorDialog(_("A game is not currently running."));