Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
S Gopal Rajagopal
2015-02-20 01:57:46 +05:30
parent 68978a0109 c1786df2a6
commit 1356a17e84
28 changed files with 911 additions and 2443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utilities/Thread.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
{
case 0x7f:
{
if (repe && !oso) // MOVDQU xmm/m, xmm
if ((repe && !oso) || (!repe && oso)) // MOVDQU/MOVDQA xmm/m, xmm
{
out_op = X64OP_STORE;
out_reg = get_modRM_reg_xmm(code, rex);
Utilities/Timer.h
+4 -4
View File
@@ -28,22 +28,22 @@ public:
double GetElapsedTimeInSec() const
{
return GetElapsedTimeInMicroSec() / 1000000.0;
return double(GetElapsedTimeInMicroSec()) / 1000000.0;
}
double GetElapsedTimeInMilliSec() const
{
return GetElapsedTimeInMicroSec() / 1000.0;
return double(GetElapsedTimeInMicroSec()) / 1000.0;
}
double GetElapsedTimeInMicroSec() const
u64 GetElapsedTimeInMicroSec() const
{
std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now();
return std::chrono::duration_cast<std::chrono::microseconds>(now - m_start).count();
}
double GetElapsedTimeInNanoSec() const
u64 GetElapsedTimeInNanoSec() const
{
std::chrono::high_resolution_clock::time_point now = m_stopped ? m_end : std::chrono::high_resolution_clock::now();