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

MMU: Drop force inline usage. 

This is not needed, the compiler will do it on it's own if required.
This commit is contained in:
degasus 2016-09-07 00:13:25 +02:00
parent 4b3e388bd7
commit d1488d0dc4
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/PowerPC/MMU.cpp
View File

@ -163,7 +163,7 @@ BatTable dbat_table;
static void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite); static void GenerateDSIException(u32 _EffectiveAddress, bool _bWrite);
template <XCheckTLBFlag flag, typename T, bool never_translate = false> template <XCheckTLBFlag flag, typename T, bool never_translate = false>
__forceinline static T ReadFromHardware(u32 em_address) static T ReadFromHardware(u32 em_address)
{ {
if (!never_translate && UReg_MSR(MSR).DR) if (!never_translate && UReg_MSR(MSR).DR)
{ {
@ -243,7 +243,7 @@ __forceinline static T ReadFromHardware(u32 em_address)
} }
template <XCheckTLBFlag flag, typename T, bool never_translate = false> template <XCheckTLBFlag flag, typename T, bool never_translate = false>
__forceinline static void WriteToHardware(u32 em_address, const T data) static void WriteToHardware(u32 em_address, const T data)
{ {
if (!never_translate && UReg_MSR(MSR).DR) if (!never_translate && UReg_MSR(MSR).DR)
{ {
@ -412,7 +412,7 @@ u32 HostRead_Instruction(const u32 address)
return inst.hex; return inst.hex;
} }
static __forceinline void Memcheck(u32 address, u32 var, bool write, int size) static void Memcheck(u32 address, u32 var, bool write, int size)
{ {
if (PowerPC::memchecks.HasAny()) if (PowerPC::memchecks.HasAny())
{ {
@ -953,8 +953,7 @@ enum TLBLookupResult
TLB_UPDATE_C TLB_UPDATE_C
}; };
static __forceinline TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, static TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag flag, const u32 vpa, u32* paddr)
u32* paddr)
{ {
u32 tag = vpa >> HW_PAGE_INDEX_SHIFT; u32 tag = vpa >> HW_PAGE_INDEX_SHIFT;
PowerPC::tlb_entry* tlbe = &PowerPC::ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK]; PowerPC::tlb_entry* tlbe = &PowerPC::ppcState.tlb[IsOpcodeFlag(flag)][tag & HW_PAGE_INDEX_MASK];
@ -1005,7 +1004,7 @@ static __forceinline TLBLookupResult LookupTLBPageAddress(const XCheckTLBFlag fl
return TLB_NOTFOUND; return TLB_NOTFOUND;
} }
static __forceinline void UpdateTLBEntry(const XCheckTLBFlag flag, UPTE2 PTE2, const u32 address) static void UpdateTLBEntry(const XCheckTLBFlag flag, UPTE2 PTE2, const u32 address)
{ {
if (IsNoExceptionFlag(flag)) if (IsNoExceptionFlag(flag))
return; return;
@ -1032,8 +1031,7 @@ void InvalidateTLBEntry(u32 address)
} }
// Page Address Translation // Page Address Translation
static __forceinline TranslateAddressResult TranslatePageAddress(const u32 address, static TranslateAddressResult TranslatePageAddress(const u32 address, const XCheckTLBFlag flag)
const XCheckTLBFlag flag)
{ {
// TLB cache // TLB cache
// This catches 99%+ of lookups in practice, so the actual page table entry code below doesn't // This catches 99%+ of lookups in practice, so the actual page table entry code below doesn't
@ -1235,7 +1233,7 @@ void IBATUpdated()
// So we first check if there is a matching BAT entry, else we look for the TLB in // So we first check if there is a matching BAT entry, else we look for the TLB in
// TranslatePageAddress(). // TranslatePageAddress().
template <const XCheckTLBFlag flag> template <const XCheckTLBFlag flag>
TranslateAddressResult TranslateAddress(const u32 address) static TranslateAddressResult TranslateAddress(const u32 address)
{ {
u32 bat_result = (flag == FLAG_OPCODE ? ibat_table : dbat_table)[address >> BAT_INDEX_SHIFT]; u32 bat_result = (flag == FLAG_OPCODE ? ibat_table : dbat_table)[address >> BAT_INDEX_SHIFT];
if (bat_result & 1) if (bat_result & 1)