The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-10 08:09:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7139 from lioncash/tb

Browse Source 
PowerPC: Add functions to read/write the full timebase value
This commit is contained in:
Markus Wick 2018-06-21 09:52:13 +02:00 committed by GitHub
commit 9f03d8ca6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ u32 GetFakeDecrementer()
void TimeBaseSet()
{
CoreTiming::SetFakeTBStartTicks(CoreTiming::GetTicks());
CoreTiming::SetFakeTBStartValue(*((u64*)&TL));
CoreTiming::SetFakeTBStartValue(PowerPC::ReadFullTimeBaseValue());
}
u64 GetFakeTimeBase()

8
Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
View File

@ -4,8 +4,6 @@
#include "Core/PowerPC/Interpreter/Interpreter.h"
#include <cstring>
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
#include "Common/FPURoundMode.h"
@ -253,11 +251,7 @@ void Interpreter::mfspr(UGeckoInstruction inst)
case SPR_TL:
case SPR_TU:
{
// works since we are little endian and TL comes first :)
const u64 time_base = SystemTimers::GetFakeTimeBase();
std::memcpy(&TL, &time_base, sizeof(u64));
}
PowerPC::WriteFullTimeBaseValue(SystemTimers::GetFakeTimeBase());
break;
case SPR_WPAR:

12
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -349,6 +349,18 @@ void RunLoop()
Host_UpdateDisasmDialog();
}
u64 ReadFullTimeBaseValue()
{
u64 value;
std::memcpy(&value, &TL, sizeof(value));
return value;
}
void WriteFullTimeBaseValue(u64 value)
{
std::memcpy(&TL, &value, sizeof(value));
}
void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst)
{
switch (MMCR0.PMC1SELECT)

3
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -178,6 +178,9 @@ void RunLoop();
u32 CompactCR();
void ExpandCR(u32 cr);
u64 ReadFullTimeBaseValue();
void WriteFullTimeBaseValue(u64 value);
void UpdatePerformanceMonitor(u32 cycles, u32 num_load_stores, u32 num_fp_inst);
// Easy register access macros.

7
Source/Core/DolphinQt2/Debugger/RegisterWidget.cpp
View File

@ -263,12 +263,7 @@ void RegisterWidget::PopulateTable()
// Special registers
// TB
AddRegister(16, 5, RegisterType::tb, "TB",
[] {
return static_cast<u64>(PowerPC::ppcState.spr[SPR_TU]) << 32 |
PowerPC::ppcState.spr[SPR_TL];
},
nullptr);
AddRegister(16, 5, RegisterType::tb, "TB", PowerPC::ReadFullTimeBaseValue, nullptr);
// PC
AddRegister(17, 5, RegisterType::pc, "PC", [] { return PowerPC::ppcState.pc; },

4
Source/Core/DolphinWX/Debugger/RegisterView.cpp
View File

@ -334,9 +334,7 @@ wxString CRegTable::GetValue(int row, int col)
PowerPC::ppcState.spr[SPR_IBAT4L + (row - 16) * 2]);
if (row == 16)
return wxString::Format("%016" PRIx64, static_cast<u64>(PowerPC::ppcState.spr[SPR_TU])
<< 32 |
PowerPC::ppcState.spr[SPR_TL]);
return wxString::Format("%016" PRIx64, PowerPC::ReadFullTimeBaseValue());
break;
}