Various stubbing

Bigpet · Aug 6, 2015 · 480996b · 480996b
1 parent 1012a3e
commit 480996b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp
@@ -910,7 +910,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
 	{
 		if (u32 value = ARGS(0))
 		{
-			LOG_WARNING(RSX, "TODO: NNV4097_INLINE_ARRAY: 0x%x", value);
+			LOG_WARNING(RSX, "TODO: NV4097_INLINE_ARRAY: 0x%x", value);
 		}
 		break;
 	}

diff --git a/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp b/rpcs3/Emu/SysCalls/Modules/sys_prx_.cpp
@@ -25,6 +25,8 @@ void sysPrxForUser_sys_prx_init()
 
 	REG_FUNC(sysPrxForUser, sys_prx_load_module);
 	REG_FUNC(sysPrxForUser, sys_prx_load_module_by_fd);
+	REG_FUNC(sysPrxForUser, sys_prx_load_module_on_memcontainer);
+	REG_FUNC(sysPrxForUser, sys_prx_load_module_on_memcontainer_by_fd);
 	REG_FUNC(sysPrxForUser, sys_prx_load_module_list);
 	REG_FUNC(sysPrxForUser, sys_prx_load_module_list_on_memcontainer);
 	REG_FUNC(sysPrxForUser, sys_prx_start_module);
@@ -36,8 +38,6 @@ void sysPrxForUser_sys_prx_init()
 	REG_FUNC(sysPrxForUser, sys_prx_get_module_info);
 	REG_FUNC(sysPrxForUser, sys_prx_get_module_id_by_name);
 	REG_FUNC(sysPrxForUser, sys_prx_get_module_id_by_address);
-	REG_FUNC(sysPrxForUser, sys_prx_load_module_on_memcontainer);
-	REG_FUNC(sysPrxForUser, sys_prx_load_module_on_memcontainer_by_fd);
 	REG_FUNC(sysPrxForUser, sys_prx_exitspawn_with_level);
 	REG_FUNC(sysPrxForUser, sys_prx_get_my_module_id);
 }
diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp b/rpcs3/Emu/SysCalls/lv2/sys_prx.cpp
@@ -31,10 +31,14 @@ s32 prx_load_module(std::string path, u64 flags, vm::ptr<sys_prx_load_module_opt
 
 	vfsFile f(path);
 	if (!f.IsOpened())
+	{
 		return CELL_PRX_ERROR_UNKNOWN_MODULE;
+	}
 
 	if (loader.init(f) != loader::handler::error_code::ok || !loader.is_sprx())
+	{
 		return CELL_PRX_ERROR_ILLEGAL_LIBRARY;
+	}
 
 	loader::handlers::elf64::sprx_info info;
 	loader.load_sprx(info);
@@ -242,9 +246,9 @@ s32 sys_prx_unload_module(s32 id, u64 flags, vm::ptr<sys_prx_unload_module_optio
 	return CELL_OK;
 }
 
-s32 sys_prx_get_module_list()
+s32 sys_prx_get_module_list(u64 flags, vm::ptr<sys_prx_get_module_list_t> pInfo)
 {
-	sys_prx.Todo("sys_prx_get_module_list()");
+	sys_prx.Todo("sys_prx_get_module_list(flags=%d, pInfo=*0x%x)", flags, pInfo);
 	return CELL_OK;
 }
 
@@ -270,9 +274,9 @@ s32 sys_prx_get_module_id_by_name(vm::cptr<char> name, u64 flags, vm::ptr<sys_pr
 	return CELL_PRX_ERROR_UNKNOWN_MODULE;
 }
 
-s32 sys_prx_get_module_info()
+s32 sys_prx_get_module_info(s32 id, u64 flags, vm::ptr<sys_prx_module_info_t> info)
 {
-	sys_prx.Todo("sys_prx_get_module_info()");
+	sys_prx.Todo("sys_prx_get_module_info(id=%d, flags=%d, info=*0x%x)", id, flags, info);
 	return CELL_OK;
 }
 

diff --git a/rpcs3/Emu/SysCalls/lv2/sys_prx.h b/rpcs3/Emu/SysCalls/lv2/sys_prx.h
@@ -157,6 +157,14 @@ struct sys_prx_unload_module_option_t
 	be_t<u64> size;
 };
 
+struct sys_prx_get_module_list_t
+{
+	be_t<u64> size;
+	be_t<u32> max;
+	be_t<u32> count;
+	vm::bptr<s32> idlist;
+};
+
 // Auxiliary data types
 struct lv2_prx_t
 {
@@ -182,11 +190,11 @@ s32 sys_prx_load_module_on_memcontainer_by_fd();
 s32 sys_prx_start_module(s32 id, u64 flags, vm::ptr<sys_prx_start_module_option_t> pOpt);
 s32 sys_prx_stop_module(s32 id, u64 flags, vm::ptr<sys_prx_stop_module_option_t> pOpt);
 s32 sys_prx_unload_module(s32 id, u64 flags, vm::ptr<sys_prx_unload_module_option_t> pOpt);
-s32 sys_prx_get_module_list();
+s32 sys_prx_get_module_list(u64 flags, vm::ptr<sys_prx_get_module_list_t> pInfo);
 s32 sys_prx_get_my_module_id();
 s32 sys_prx_get_module_id_by_address();
 s32 sys_prx_get_module_id_by_name(vm::cptr<char> name, u64 flags, vm::ptr<sys_prx_get_module_id_by_name_option_t> pOpt);
-s32 sys_prx_get_module_info();
+s32 sys_prx_get_module_info(s32 id, u64 flags, vm::ptr<sys_prx_module_info_t> info);
 s32 sys_prx_register_library(vm::ptr<void> library);
 s32 sys_prx_unregister_library(vm::ptr<void> library);
 s32 sys_prx_get_ppu_guid();