summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2015-05-02 22:30:56 +0200
committerdegasus <wickmarkus@web.de>2015-05-25 09:33:34 +0200
commitac0e3041599429f271d6fddc284ec3e4753c0cd3 (patch)
tree5ca7f541a99860fc58a74dc4186db4d62bb704ce /Source/Core
parent732802ebd025675c4b257a5c79d49dd8d2597bb1 (diff)
Jitregister: fix common-core dependency
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Common/JitRegister.cpp4
-rw-r--r--Source/Core/Common/JitRegister.h2
-rw-r--r--Source/Core/Core/PowerPC/JitCommon/JitCache.cpp2
3 files changed, 3 insertions, 5 deletions
diff --git a/Source/Core/Common/JitRegister.cpp b/Source/Core/Common/JitRegister.cpp
index 7b0d24454a..47ddf19c79 100644
--- a/Source/Core/Common/JitRegister.cpp
+++ b/Source/Core/Common/JitRegister.cpp
@@ -12,7 +12,6 @@
#include "Common/FileUtil.h"
#include "Common/JitRegister.h"
#include "Common/StringUtil.h"
-#include "Core/ConfigManager.h"
#ifdef _WIN32
#include <process.h>
@@ -38,13 +37,12 @@ static File::IOFile s_perf_map_file;
namespace JitRegister
{
-void Init()
+void Init(const std::string& perf_dir)
{
#if defined USE_OPROFILE && USE_OPROFILE
s_agent = op_open_agent();
#endif
- const std::string& perf_dir = SConfig::GetInstance().m_LocalCoreStartupParameter.m_perfDir;
if (!perf_dir.empty())
{
std::string filename = StringFromFormat("%s/perf-%d.map", perf_dir.data(), getpid());
diff --git a/Source/Core/Common/JitRegister.h b/Source/Core/Common/JitRegister.h
index ce63aeace0..a1f19d9fef 100644
--- a/Source/Core/Common/JitRegister.h
+++ b/Source/Core/Common/JitRegister.h
@@ -9,7 +9,7 @@
namespace JitRegister
{
-void Init();
+void Init(const std::string& perf_dir);
void Shutdown();
void RegisterV(const void* base_address, u32 code_size,
const char* format, va_list args);
diff --git a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
index 6a7b6102d4..003cea9e90 100644
--- a/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
+++ b/Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
@@ -36,7 +36,7 @@ using namespace Gen;
return;
}
- JitRegister::Init();
+ JitRegister::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_perfDir);
iCache.fill(JIT_ICACHE_INVALID_BYTE);
iCacheEx.fill(JIT_ICACHE_INVALID_BYTE);