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 #6619 from lioncash/profiler 

Profiler: Move BlockStat and ProfileStats structures into the Profiler namespace
This commit is contained in:
JosJuice 2018-04-09 08:19:16 +02:00 committed by GitHub
parent 9dbc760bb7 a0f943178b
commit 7bc1063d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/PowerPC/JitInterface.cpp
View File

@ -78,7 +78,7 @@ CPUCoreBase* GetCore()
void WriteProfileResults(const std::string& filename) void WriteProfileResults(const std::string& filename)
{ {
ProfileStats prof_stats; Profiler::ProfileStats prof_stats;
GetProfileResults(&prof_stats); GetProfileResults(&prof_stats);
File::IOFile f(filename, "w"); File::IOFile f(filename, "w");
@ -101,7 +101,7 @@ void WriteProfileResults(const std::string& filename)
} }
} }
void GetProfileResults(ProfileStats* prof_stats) void GetProfileResults(Profiler::ProfileStats* prof_stats)
{ {
// Can't really do this with no g_jit core available // Can't really do this with no g_jit core available
if (!g_jit) if (!g_jit)

6
Source/Core/Core/PowerPC/JitInterface.h
View File

@ -11,7 +11,11 @@
class CPUCoreBase; class CPUCoreBase;
class PointerWrap; class PointerWrap;
namespace Profiler
{
struct ProfileStats; struct ProfileStats;
}
namespace JitInterface namespace JitInterface
{ {
@ -29,7 +33,7 @@ CPUCoreBase* GetCore();
// Debugging // Debugging
void WriteProfileResults(const std::string& filename); void WriteProfileResults(const std::string& filename);
void GetProfileResults(ProfileStats* prof_stats); void GetProfileResults(Profiler::ProfileStats* prof_stats);
int GetHostCode(u32* address, const u8** code, u32* code_size); int GetHostCode(u32* address, const u8** code, u32* code_size);
// Memory Utilities // Memory Utilities

10
Source/Core/Core/PowerPC/Profiler.h
View File

@ -10,6 +10,10 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
namespace Profiler
{
extern bool g_ProfileBlocks;
struct BlockStat struct BlockStat
{ {
BlockStat(u32 _addr, u64 c, u64 ticks, u64 run, u32 size) BlockStat(u32 _addr, u64 c, u64 ticks, u64 run, u32 size)
@ -32,9 +36,5 @@ struct ProfileStats
u64 countsPerSec; u64 countsPerSec;
}; };
namespace Profiler
{
extern bool g_ProfileBlocks;
void WriteProfileResults(const std::string& filename); void WriteProfileResults(const std::string& filename);
} } // namespace Profiler