catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing linux compile

This commit is contained in:
georgemoralis 2024-05-15 12:57:58 +03:00
parent 932f0435e8
commit 074f3d3f88
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/libraries/libc_internal/libc_internal.cpp
View File

@ -1,7 +1,7 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
// Generated By moduleGenerator #include <cmath>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/libraries/error_codes.h" #include "core/libraries/error_codes.h"
#include "core/libraries/libs.h" #include "core/libraries/libs.h"
@ -17,12 +17,22 @@ void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n) {
return std::memcpy(dest, src, n); return std::memcpy(dest, src, n);
} }
errno_t PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count) { int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count) {
#ifdef _WIN64
return memcpy_s(dest, destsz, src, count); return memcpy_s(dest, destsz, src, count);
#else
std::memcpy(dest, destsz, src, count);
return 0; // ALL OK
#endif
} }
errno_t PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src) { int PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src) {
#ifdef _WIN64
return strcpy_s(dest, dest_size, src); return strcpy_s(dest, dest_size, src);
#else
std::strcpy(dest, src);
return 0; // ALL OK
#endif
} }
int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n) { int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n) {
@ -30,7 +40,7 @@ int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n) {
} }
float PS4_SYSV_ABI internal_expf(float x) { float PS4_SYSV_ABI internal_expf(float x) {
return std::expf(x); return expf(x);
} }
void RegisterlibSceLibcInternal(Core::Loader::SymbolsResolver* sym) { void RegisterlibSceLibcInternal(Core::Loader::SymbolsResolver* sym) {

4
src/core/libraries/libc_internal/libc_internal.h
View File

@ -12,8 +12,8 @@ class SymbolsResolver;
namespace Libraries::LibcInternal { namespace Libraries::LibcInternal {
void* PS4_SYSV_ABI internal_memset(void* s, int c, size_t n); void* PS4_SYSV_ABI internal_memset(void* s, int c, size_t n);
void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n); void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n);
errno_t PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count); int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count);
errno_t PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src); int PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src);
int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n); int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n);
float PS4_SYSV_ABI internal_expf(float x); float PS4_SYSV_ABI internal_expf(float x);