Merge 1c641cd into 22e679e

RPCS3 · Apr 5, 2017 · fb4bcc5 · fb4bcc5
2 parents 22e679e + 1c641cd
commit fb4bcc5
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/rpcs3/Emu/Cell/Modules/cellLibprof.cpp b/rpcs3/Emu/Cell/Modules/cellLibprof.cpp
@@ -0,0 +1,36 @@
+#include "stdafx.h"
+#include "Emu/Cell/PPUModule.h"
+
+logs::channel cellLibprof("cellLibprof", logs::level::notice);
+
+s32 cellUserTraceInit()
+{
+	UNIMPLEMENTED_FUNC(cellLibprof);
+	return CELL_OK;
+}
+
+s32 cellUserTraceRegister()
+{
+	UNIMPLEMENTED_FUNC(cellLibprof);
+	return CELL_OK;
+}
+
+s32 cellUserTraceUnregister()
+{
+	UNIMPLEMENTED_FUNC(cellLibprof);
+	return CELL_OK;
+}
+
+s32 cellUserTraceTerminate()
+{
+	UNIMPLEMENTED_FUNC(cellLibprof);
+	return CELL_OK;
+}
+
+DECLARE(ppu_module_manager::cellLibprof)("cellLibprof", []()
+{
+	REG_FUNC(cellLibprof, cellUserTraceInit);
+	REG_FUNC(cellLibprof, cellUserTraceRegister);
+	REG_FUNC(cellLibprof, cellUserTraceUnregister);
+	REG_FUNC(cellLibprof, cellUserTraceTerminate);
+});
diff --git a/rpcs3/Emu/Cell/PPUModule.cpp b/rpcs3/Emu/Cell/PPUModule.cpp
@@ -47,6 +47,7 @@ LOG_CHANNEL(cellJpgDec);
 LOG_CHANNEL(cellJpgEnc);
 LOG_CHANNEL(cellKey2char);
 LOG_CHANNEL(cellL10n);
+LOG_CHANNEL(cellLibprof);
 LOG_CHANNEL(cellMic);
 LOG_CHANNEL(cellMusic);
 LOG_CHANNEL(cellMusicDecode);
@@ -239,6 +240,7 @@ static void ppu_initialize_modules()
 		&ppu_module_manager::cellJpgEnc,
 		&ppu_module_manager::cellKey2char,
 		&ppu_module_manager::cellL10n,
+		&ppu_module_manager::cellLibprof,
 		&ppu_module_manager::cellMic,
 		&ppu_module_manager::cellMusic,
 		&ppu_module_manager::cellMusicDecode,

diff --git a/rpcs3/Emu/Cell/PPUModule.h b/rpcs3/Emu/Cell/PPUModule.h
@@ -134,6 +134,7 @@ class ppu_module_manager final
 	static const ppu_static_module cellJpgEnc;
 	static const ppu_static_module cellKey2char;
 	static const ppu_static_module cellL10n;
+	static const ppu_static_module cellLibprof;
 	static const ppu_static_module cellMic;
 	static const ppu_static_module cellMusic;
 	static const ppu_static_module cellMusicDecode;

diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
@@ -170,6 +170,7 @@
     <ClCompile Include="Emu\Cell\Modules\cellKb.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellKey2char.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellL10n.cpp" />
+    <ClCompile Include="Emu\Cell\Modules\cellLibprof.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellMic.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellMouse.cpp" />
     <ClCompile Include="Emu\Cell\Modules\cellMsgDialog.cpp" />

diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
@@ -389,6 +389,9 @@
     <ClCompile Include="Emu\Cell\Modules\cellL10n.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\Cell\Modules\cellLibprof.cpp">
+      <Filter>Emu\Cell\Modules</Filter>
+    </ClCompile>
     <ClCompile Include="Emu\Cell\Modules\cellMic.cpp">
       <Filter>Emu\Cell\Modules</Filter>
     </ClCompile>