Merge pull request #19972 from Nemoumbra/scenet_lib

Adding sceNet_lib

CMakeLists.txt

@@ -2252,6 +2252,8 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/HLE/sceMpeg.h
 	Core/HLE/sceNet.cpp
 	Core/HLE/sceNet.h
+	Core/HLE/sceNet_lib.cpp
+	Core/HLE/sceNet_lib.h
 	Core/HLE/sceNetAdhoc.cpp
 	Core/HLE/sceNetAdhoc.h
 	Core/HLE/sceNetAdhocMatching.cpp

Core/Core.vcxproj

@@ -725,6 +725,7 @@
     <ClCompile Include="HLE\sceKernelVTimer.cpp" />
     <ClCompile Include="HLE\sceMpeg.cpp" />
     <ClCompile Include="HLE\sceNet.cpp" />
+    <ClCompile Include="HLE\sceNet_lib.cpp" />
     <ClCompile Include="HLE\sceNetAdhoc.cpp" />
     <ClCompile Include="HLE\sceNetAdhocMatching.cpp" />
     <ClCompile Include="HLE\sceNp.cpp" />
@@ -1303,6 +1304,7 @@
     <ClInclude Include="HLE\sceKernelTime.h" />
     <ClInclude Include="HLE\sceMpeg.h" />
     <ClInclude Include="HLE\sceNet.h" />
+    <ClInclude Include="HLE\sceNet_lib.h" />
     <ClInclude Include="HLE\sceNetAdhoc.h" />
     <ClInclude Include="HLE\sceNetAdhocMatching.h" />
     <ClInclude Include="HLE\sceNp.h" />

Core/Core.vcxproj.filters

@@ -273,6 +273,9 @@
     <ClCompile Include="HLE\sceNet.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
+    <ClCompile Include="HLE\sceNet_lib.cpp">
+      <Filter>HLE\Libraries</Filter>
+    </ClCompile>
     <ClCompile Include="HLE\scePower.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
@@ -1503,6 +1506,9 @@
     <ClInclude Include="HLE\sceNet.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
+    <ClInclude Include="HLE\sceNet_lib.h">
+      <Filter>HLE\Libraries</Filter>
+    </ClInclude>
     <ClInclude Include="HLE\scePower.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>

Core/HLE/FunctionWrappers.h

@@ -513,6 +513,11 @@ template<int func(const char *, u32, int)> void WrapI_CUI() {
 	RETURN(retval);
 }
 
+template<u32 func(const char *, u32, int)> void WrapU_CUI() {
+	u32 retval = func(Memory::GetCharPointer(PARAM(0)), PARAM(1), PARAM(2));
+	RETURN(retval);
+}
+
 template<int func(int, const char *, int, u32)> void WrapI_ICIU() {
 	int retval = func(PARAM(0), Memory::GetCharPointer(PARAM(1)), PARAM(2), PARAM(3));
 	RETURN(retval);
@@ -864,3 +869,33 @@ template<int func(void *, u32, int)> void WrapI_VUI(){
 	u32 retval = func(Memory::GetPointerWrite(PARAM(0)), PARAM(1), PARAM(2));
 	RETURN(retval);
 }
+
+template<u32 func(void *, u32, u32)> void WrapU_VUU() {
+	u32 retval = func(Memory::GetPointerWrite(PARAM(0)), PARAM(1), PARAM(2));
+	RETURN(retval);
+}
+
+template<u32 func(void *, const char *)> void WrapU_VC() {
+	u32 retval = func(Memory::GetPointerWrite(PARAM(0)), Memory::GetCharPointer(PARAM(1)));
+	RETURN(retval);
+}
+
+template<int func(const char *, const char*, u32)> void WrapI_CCU() {
+	int retval = func(Memory::GetCharPointer(PARAM(0)), Memory::GetCharPointer(PARAM(1)), PARAM(2));
+	RETURN(retval);
+}
+
+template<int func(const char *, const char*)> void WrapI_CC() {
+	int retval = func(Memory::GetCharPointer(PARAM(0)), Memory::GetCharPointer(PARAM(1)));
+	RETURN(retval);
+}
+
+template<u32 func(void *, const char *, u32)> void WrapU_VCU() {
+	u32 retval = func(Memory::GetPointerWrite(PARAM(0)), Memory::GetCharPointer(PARAM(1)), PARAM(2));
+	RETURN(retval);
+}
+
+template<u32 func(void *, int)> void WrapU_VI() {
+	u32 retval = func(Memory::GetPointerWrite(PARAM(0)), PARAM(1));
+	RETURN(retval);
+}

Core/HLE/HLETables.cpp

@@ -84,6 +84,7 @@
 #include "sceNetInet.h"
 #include "sceNetResolver.h"
 // #include "sceNp2.h"
+#include "sceNet_lib.h"
 
 #define N(s) s
 
@@ -319,6 +320,7 @@ void RegisterAllModules() {
 	Register_mp4msv();
 	Register_InterruptManagerForKernel();
 	Register_sceSircs();
+	Register_sceNet_lib();
 	// Not ready to enable this due to apparent softlocks in Patapon 3.
 	// Register_sceNpMatching2();
 

Core/HLE/sceNet_lib.cpp

@@ -0,0 +1,137 @@
+// Copyright (c) 2025- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+
+#include "Core/HLE/sceNet_lib.h"
+
+#include "Core/HLE/FunctionWrappers.h"
+#include "Core/HLE/HLE.h"
+
+#include <cstring>
+
+
+// This is one of the firmware modules (pspnet.prx), the official PSP games can't call these funcs
+
+
+u32 sceNetStrtoul(const char *str, u32 strEndAddrPtr, int base) {
+	// Redirect that to libc
+	char* str_end = nullptr;
+	u32 res = std::strtoul(str, &str_end, base);
+
+	// Remap the pointer
+	u32 psp_str_end = Memory::GetAddressFromHostPointer(str_end);
+	Memory::Write_U32(psp_str_end, strEndAddrPtr);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+u32 sceNetMemmove(void* dest, u32 srcPtr, u32 count) {
+	// Redirect that to libc
+	void* host_ptr = std::memmove(
+		dest, Memory::GetPointer(srcPtr), count
+	);
+
+	// Remap the pointer
+	u32 res = Memory::GetAddressFromHostPointer(host_ptr);
+	return hleLogDebug(Log::sceNet, res);
+}
+
+u32 sceNetStrcpy(void* dest, const char *src) {
+	// Redirect that to libc
+	char* host_ptr = std::strcpy(static_cast<char*>(dest), src);
+
+	// Remap the pointer
+	u32 res = Memory::GetAddressFromHostPointer(host_ptr);
+	return hleLogDebug(Log::sceNet, res);
+}
+
+s32 sceNetStrncmp(const char *lhs, const char *rhs, u32 count) {
+	// Redirect that to libc
+	s32 res = std::strncmp(lhs, rhs, count);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+s32 sceNetStrcasecmp(const char *lhs, const char *rhs) {
+	// Redirect that to eh... what is this, a libc extension?
+	s32 res = strcasecmp(lhs, rhs);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+s32 sceNetStrcmp(const char *lhs, const char *rhs) {
+	// Redirect that to libc
+	s32 res = std::strcmp(lhs, rhs);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+u32 sceNetStrncpy(void *dest, const char *src, u32 count) {
+	// Redirect that to libc
+	char* host_ptr = std::strncpy(static_cast<char*>(dest), src, count);
+
+	// Remap the pointer
+	u32 res = Memory::GetAddressFromHostPointer(host_ptr);
+	return hleLogDebug(Log::sceNet, res);
+}
+
+u32 sceNetStrchr(void *str, int ch) {
+	// For some reason it doesn't build for me if I make 'str' a const char *
+	// At the same time I can't make it char *, because then WrapU_CI won't work
+
+	// Redirect that to libc
+	char* host_ptr = std::strchr(static_cast<char*>(str), ch);
+
+	// Remap the pointer
+	u32 res = Memory::GetAddressFromHostPointer(host_ptr);
+	return hleLogDebug(Log::sceNet, res);
+}
+
+u32 sceNetStrlen(const char* str) {
+	// Redirect that to libc
+	u32 res = std::strlen(str);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+s32 sceNetMemcmp(u32 lhsPtr, u32 rhsPtr, u32 count) {
+	// Redirect that to libc
+	s32 res = std::memcmp(Memory::GetPointer(lhsPtr), Memory::GetPointer(rhsPtr), count);
+
+	return hleLogDebug(Log::sceNet, res);
+}
+
+
+const HLEFunction sceNet_lib[] = {
+	{0X1858883D, nullptr,                        "sceNetRand",                  'i', ""       },
+	{0X2A73ADDC, &WrapU_CUI<sceNetStrtoul>,      "sceNetStrtoul",               'i', "sxi"    },
+	{0X4753D878, &WrapU_VUU<sceNetMemmove>,      "sceNetMemmove",               'i', "xxx"    },
+	{0X80C9F02A, &WrapU_VC<sceNetStrcpy>,        "sceNetStrcpy",                'i', "xs"     },
+	{0X94DCA9F0, &WrapI_CCU<sceNetStrncmp>,      "sceNetStrncmp",               'i', "ssx"    },
+	{0X9CFBC7E3, &WrapI_CC<sceNetStrcasecmp>,    "sceNetStrcasecmp",            'i', "ss"     },
+	{0XA0F16ABD, &WrapI_CC<sceNetStrcmp>,        "sceNetStrcmp",                'i', "ss"     },
+	{0XB5CE388A, &WrapU_VCU<sceNetStrncpy>,      "sceNetStrncpy",               'i', "xsx"    },
+	{0XBCBE14CF, &WrapU_VI<sceNetStrchr>,        "sceNetStrchr",                'i', "si"     },
+	{0XCF705E46, nullptr,                        "sceNetSprintf",               'i', ""       },
+	{0XD8722983, &WrapU_C<sceNetStrlen>,         "sceNetStrlen",                'i', "s"      },
+	{0XE0A81C7C, &WrapI_UUU<sceNetMemcmp>,       "sceNetMemcmp",                'i', "xxx"    },
+};
+
+
+void Register_sceNet_lib() {
+	RegisterModule("sceNet_lib", ARRAY_SIZE(sceNet_lib), sceNet_lib);
+}

Core/HLE/sceNet_lib.h

@@ -0,0 +1,19 @@
+// Copyright (c) 2025- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+
+void Register_sceNet_lib();

UWP/CoreUWP/CoreUWP.vcxproj

@@ -234,6 +234,7 @@
     <ClInclude Include="..\..\Core\HLE\sceMpeg.h" />
     <ClInclude Include="..\..\Core\HLE\sceMt19937.h" />
     <ClInclude Include="..\..\Core\HLE\sceNet.h" />
+    <ClInclude Include="..\..\Core\HLE\sceNet_lib.h" />
     <ClInclude Include="..\..\Core\HLE\sceNetAdhoc.h" />
     <ClInclude Include="..\..\Core\HLE\sceNetAdhocMatching.h" />
     <ClInclude Include="..\..\Core\HLE\sceNp.h" />
@@ -493,6 +494,7 @@
     <ClCompile Include="..\..\Core\HLE\sceMpeg.cpp" />
     <ClCompile Include="..\..\Core\HLE\sceMt19937.cpp" />
     <ClCompile Include="..\..\Core\HLE\sceNet.cpp" />
+    <ClCompile Include="..\..\Core\HLE\sceNet_lib.cpp" />
     <ClCompile Include="..\..\Core\HLE\sceNetAdhoc.cpp" />
     <ClCompile Include="..\..\Core\HLE\sceNetAdhocMatching.cpp" />
     <ClCompile Include="..\..\Core\HLE\sceNp.cpp" />

UWP/CoreUWP/CoreUWP.vcxproj.filters

@@ -459,6 +459,9 @@
     <ClCompile Include="..\..\Core\HLE\sceNet.cpp">
       <Filter>HLE</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Core\HLE\sceNet_lib.cpp">
+      <Filter>HLE</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Core\HLE\sceNetAdhoc.cpp">
       <Filter>HLE</Filter>
     </ClCompile>
@@ -1546,6 +1549,9 @@
     <ClInclude Include="..\..\Core\HLE\sceNet.h">
       <Filter>HLE</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Core\HLE\sceNet_lib.h">
+      <Filter>HLE</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Core\HLE\sceNetAdhoc.h">
       <Filter>HLE</Filter>
     </ClInclude>

android/jni/Android.mk

@@ -707,6 +707,7 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/HLE/sceMp4.cpp \
   $(SRC)/Core/HLE/sceMp3.cpp \
   $(SRC)/Core/HLE/sceNet.cpp \
+  $(SRC)/Core/HLE/sceNet_lib.cpp \
   $(SRC)/Core/HLE/proAdhoc.cpp \
   $(SRC)/Core/HLE/proAdhocServer.cpp \
   $(SRC)/Core/HLE/sceNetAdhoc.cpp \

libretro/Makefile.common

@@ -739,6 +739,7 @@ SOURCES_CXX += \
 	       $(COREDIR)/HLE/sceKernelVTimer.cpp \
 	       $(COREDIR)/HLE/sceMpeg.cpp \
 	       $(COREDIR)/HLE/sceNet.cpp \
+	       $(COREDIR)/HLE/sceNet_lib.cpp \
 	       $(COREDIR)/HLE/sceNetAdhoc.cpp \
 	       $(COREDIR)/HLE/sceNetAdhocMatching.cpp \
 	       $(COREDIR)/HLE/sceNetApctl.cpp \