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

[Android] Remove ReducedSyncMem and PreAllocSyncMem

This commit is contained in:
zilmar 2017-05-04 18:19:05 +10:00
parent a7fb56a3a6
commit a6d420feee
7 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android/res/values/strings.xml
View File

@ -139,10 +139,6 @@
<string name="VerticalInterruptsPerSecond">Vertical interrupts per second</string>
<string name="RecordExecutionTimes_title">Record Execution Times</string>
<string name="RecordExecutionTimes_summary">Record how long each block executes for</string>
<string name="PreAllocSyncMem_title">Pre Alloc Sync Mem</string>
<string name="PreAllocSyncMem_summary">Allocate sync memory at startup</string>
<string name="ReducedSyncMem_title">Reduced Sync Mem</string>
<string name="ReducedSyncMem_summary">Allocate a smaller amount of memory for sync cpu</string>
<string name="DebugLanguage_title">Debug Language</string>
<string name="DebugLanguage_summary">Show the number id for the language string</string>
<string name="touchscreenScale_title">Button scale</string>

8
Android/res/xml/settings_advanced.xml
View File

@ -26,14 +26,6 @@
android:key="Debugger_RecordExecutionTimes"
android:summary="@string/RecordExecutionTimes_summary"
android:title="@string/RecordExecutionTimes_title" />
<CheckBoxPreference
android:key="PreAllocSyncMem"
android:summary="@string/PreAllocSyncMem_summary"
android:title="@string/PreAllocSyncMem_title" />
<CheckBoxPreference
android:key="ReducedSyncMem"
android:summary="@string/ReducedSyncMem_summary"
android:title="@string/ReducedSyncMem_title" />
<CheckBoxPreference
android:key="Debugger_DebugLanguage"
android:summary="@string/DebugLanguage_summary"

2
Android/src/emu/project64/jni/SettingsID.java
View File

@ -51,8 +51,6 @@ public enum SettingsID
Setting_LanguageDirDefault,
Setting_CurrentLanguage,
Setting_EnableDisk,
Setting_PreAllocSyncMem,
Setting_ReducedSyncMem,
//RDB Settings
Rdb_GoodName,

4
Android/src/emu/project64/settings/SettingsActivity.java
View File

@ -58,8 +58,6 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
.putString("touchscreenLayout",NativeExports.UISettingsLoadString(UISettingID.TouchScreen_Layout.getValue()))
.putString("Patreon_email",NativeExports.UISettingsLoadString(UISettingID.SupportWindow_PatreonEmail.getValue()))
.putBoolean("audio_Enabled",NativeExports.SettingsLoadBool(SettingsID.Plugin_EnableAudio.getValue()))
.putBoolean("PreAllocSyncMem",NativeExports.SettingsLoadBool(SettingsID.Setting_PreAllocSyncMem.getValue()))
.putBoolean("ReducedSyncMem",NativeExports.SettingsLoadBool(SettingsID.Setting_ReducedSyncMem.getValue()))
.putBoolean("UserInterface_BasicMode",NativeExports.SettingsLoadBool(SettingsID.UserInterface_BasicMode.getValue()))
.putBoolean("Debugger_Enabled",NativeExports.SettingsLoadBool(SettingsID.Debugger_Enabled.getValue()))
.putBoolean("Debugger_RecordRecompilerAsm",NativeExports.SettingsLoadBool(SettingsID.Debugger_RecordRecompilerAsm.getValue()))
@ -158,8 +156,6 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
else if (key.equals("touchscreenLayout")) { NativeExports.UISettingsSaveString(UISettingID.TouchScreen_Layout.getValue(), sharedPreferences.getString(key, "Analog")); }
else if (key.equals("Patreon_email")) { NativeExports.UISettingsSaveString(UISettingID.SupportWindow_PatreonEmail.getValue(), sharedPreferences.getString(key, "")); }
else if (key.equals("audio_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Plugin_EnableAudio.getValue(), sharedPreferences.getBoolean(key,false)); }
else if (key.equals("PreAllocSyncMem")) { NativeExports.SettingsSaveBool(SettingsID.Setting_PreAllocSyncMem.getValue(), sharedPreferences.getBoolean(key,false)); }
else if (key.equals("ReducedSyncMem")) { NativeExports.SettingsSaveBool(SettingsID.Setting_ReducedSyncMem.getValue(), sharedPreferences.getBoolean(key,false)); }
else if (key.equals("Debugger_Enabled")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_Enabled.getValue(), sharedPreferences.getBoolean(key,false)); }
else if (key.equals("Debugger_RecordRecompilerAsm")) { NativeExports.SettingsSaveBool(SettingsID.Debugger_RecordRecompilerAsm.getValue(), sharedPreferences.getBoolean(key,false)); }
else if (key.equals("Debugger_CpuUsage")) { NativeExports.SettingsSaveBool(SettingsID.UserInterface_ShowCPUPer.getValue(), sharedPreferences.getBoolean(key,false)); }

29
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -65,8 +65,8 @@ uint32_t swap32by8(uint32_t word)
__builtin_bswap32(word)
#else
(word & 0x000000FFul) << 24
| (word & 0x0000FF00ul) << 8
| (word & 0x00FF0000ul) >> 8
| (word & 0x0000FF00ul) << 8
| (word & 0x00FF0000ul) >> 8
| (word & 0xFF000000ul) >> 24
#endif
;
@ -111,10 +111,7 @@ void CMipsMemoryVM::Reset(bool /*EraseMemory*/)
void CMipsMemoryVM::ReserveMemory()
{
m_Reserve1 = (uint8_t *)AllocateAddressSpace(0x20000000);
if (g_Settings->LoadBool(Debugger_Enabled) && g_Settings->LoadBool(Setting_PreAllocSyncMem))
{
m_Reserve2 = (uint8_t *)AllocateAddressSpace(g_Settings->LoadBool(Setting_ReducedSyncMem) ? 0x04002000 : 0x20000000);
}
m_Reserve2 = (uint8_t *)AllocateAddressSpace(0x04002000);
}
void CMipsMemoryVM::FreeReservedMemory()
@ -645,7 +642,7 @@ bool CMipsMemoryVM::LB_NonMemory(uint32_t PAddr, uint32_t* Value, bool /*SignExt
// break;
// }
return true;
}
}
bool CMipsMemoryVM::LH_NonMemory(uint32_t PAddr, uint32_t* Value, bool/* SignExtend*/)
{
@ -674,12 +671,12 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t PAddr, uint32_t* Value)
if (PAddr >= CFBStart && PAddr < CFBEnd)
{
uint32_t OldProtect;
VirtualProtect(m_RDRAM+(PAddr & ~0xFFF),0xFFC,PAGE_READONLY, &OldProtect);
VirtualProtect(m_RDRAM + (PAddr & ~0xFFF), 0xFFC, PAGE_READONLY, &OldProtect);
if (FrameBufferRead)
{
FrameBufferRead(PAddr & ~0xFFF);
}
*Value = *(uint32_t *)(m_RDRAM+PAddr);
*Value = *(uint32_t *)(m_RDRAM + PAddr);
return true;
}
#endif
@ -714,7 +711,7 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t PAddr, uint32_t* Value)
}
*Value = m_MemLookupValue.UW[0];
return true;
}
}
bool CMipsMemoryVM::SB_NonMemory(uint32_t PAddr, uint8_t Value)
{
@ -816,7 +813,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value)
{
return false;
}
}
}
switch (PAddr & 0xFFF00000)
{
@ -875,7 +872,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value)
}
return true;
}
}
void CMipsMemoryVM::UpdateHalfLine()
{
@ -1576,7 +1573,7 @@ void CMipsMemoryVM::Load32Rom(void)
m_MemLookupValue.UW[0] = m_MemLookupAddress & 0xFFFF;
m_MemLookupValue.UW[0] = (m_MemLookupValue.UW[0] << 16) | m_MemLookupValue.UW[0];
}
}
}
void CMipsMemoryVM::Write32RDRAMRegisters(void)
{
@ -1839,8 +1836,8 @@ void CMipsMemoryVM::Write32DPCommandRegisters(void)
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
}
}
}
void CMipsMemoryVM::Write32MIPSInterface(void)
{
@ -1994,8 +1991,8 @@ void CMipsMemoryVM::Write32VideoInterface(void)
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
}
}
}
void CMipsMemoryVM::Write32AudioInterface(void)
{
@ -2217,4 +2214,4 @@ void CMipsMemoryVM::Write32PifRam(void)
g_MMU->PifRamWrite();
}
}
}
}

2
Source/Project64-core/Settings/Settings.h
View File

@ -56,8 +56,6 @@ enum SettingID
Setting_LanguageDirDefault,
Setting_CurrentLanguage,
Setting_EnableDisk,
Setting_PreAllocSyncMem,
Setting_ReducedSyncMem,
//RDB Settings
Rdb_GoodName,

4
Source/Project64-core/Settings/SettingsClass.cpp
View File

@ -121,8 +121,6 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory)
#endif
AddHandler(Setting_CurrentLanguage, new CSettingTypeApplication("", "Current Language", ""));
AddHandler(Setting_EnableDisk, new CSettingTypeTempBool(false));
AddHandler(Setting_PreAllocSyncMem, new CSettingTypeApplication("", "PreAllocSyncMem", true));
AddHandler(Setting_ReducedSyncMem, new CSettingTypeApplication("", "ReducedSyncMem", false));
AddHandler(Setting_LanguageDirDefault, new CSettingTypeRelativePath("Lang", ""));
AddHandler(Setting_LanguageDir, new CSettingTypeApplicationPath("Lang Directory", "Directory", Setting_LanguageDirDefault));
@ -1277,4 +1275,4 @@ void CSettings::UnregisterChangeCB(SettingID Type, void * Data, SettingChangedFu
{
g_Notify->BreakPoint(__FILE__, __LINE__);
}
}
}