several fixes (#112)

* updated fmt

* submodules updated

* fixed _TIMESPEC_DEFINED for winpthreads under windows

* fixed sdl3 under qt

* virtual_memory: Ensure mapped addresses stay inside the user area

* Fixes LLE Libc crashing on linux

---------

Co-authored-by: GPUCode <geoster3d@gmail.com>

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "third-party/fmt"]
-	path = third-party/fmt
-	url = https://github.com/fmtlib/fmt.git
-	shallow = true
 [submodule "third-party/magic_enum"]
 	path = third-party/magic_enum
 	url = https://github.com/Neargye/magic_enum.git
@@ -47,4 +43,6 @@
 [submodule "externals/sdl3"]
 	path = externals/sdl3
 	url = https://github.com/shadps4-emu/ext-SDL.git
-
+[submodule "externals/fmt"]
+	path = externals/fmt
+	url = https://github.com/shadps4-emu/ext-fmt.git

CMakeLists.txt

@@ -14,12 +14,6 @@ project(shadps4)
 
 option(ENABLE_QT_GUI "Enable the Qt GUI. If not selected then the emulator uses a minimal SDL-based UI instead" OFF)
 
-if(ENABLE_QT_GUI)
-    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
-    qt_standard_project_setup()
-    set(CMAKE_AUTORCC ON)
-endif()
-
 # This function should be passed a list of all files in a target. It will automatically generate
 # file groups following the directory hierarchy, so that the layout of the files in IDEs matches the
 # one in the filesystem.
@@ -93,6 +87,12 @@ add_subdirectory(externals)
 add_subdirectory(third-party)
 include_directories(src)
 
+if(ENABLE_QT_GUI)
+    find_package(Qt6 REQUIRED COMPONENTS Widgets Concurrent)
+    qt_standard_project_setup()
+    set(CMAKE_AUTORCC ON)
+endif()
+
 set(AUDIO_CORE src/audio_core/sdl_audio.cpp 
                src/audio_core/sdl_audio.h
 )
@@ -331,7 +331,7 @@ endif()
 
 create_target_directory_groups(shadps4)
 
-target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11)
+target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 SDL3-shared)
 target_link_libraries(shadps4 PRIVATE discord-rpc vulkan-1 xxhash Zydis)
 
 if(NOT ENABLE_QT_GUI)
@@ -352,6 +352,7 @@ if (WIN32)
     target_link_libraries(shadps4 PRIVATE mincore winpthread clang_rt.builtins-x86_64.lib)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
     add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
+    add_definitions(-D_TIMESPEC_DEFINED) #needed for conflicts with time.h of windows.h
 endif()
 
 if(WIN32)
@@ -373,12 +374,10 @@ add_custom_command(TARGET shadps4 POST_BUILD
      $<TARGET_FILE_DIR:shadps4>
 )
 
-if(NOT ENABLE_QT_GUI)
 add_custom_command(TARGET shadps4 POST_BUILD
    COMMAND ${CMAKE_COMMAND} -E copy_if_different
      $<TARGET_FILE:SDL3-shared>
      $<TARGET_FILE_DIR:shadps4>)
-endif()
 
 if (WIN32)
  add_custom_command(TARGET shadps4 POST_BUILD

externals/CMakeLists.txt

@@ -6,6 +6,9 @@ if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
 endif()
 
+# fmtlib
+add_subdirectory(fmt EXCLUDE_FROM_ALL)
+
 # Discord-RPC
 set(BUILD_EXAMPLES OFF CACHE BOOL "")
 add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
@@ -30,7 +33,5 @@ set(WITH_NEW_STRATEGIES ON)
 set(WITH_NATIVE_INSTRUCTIONS ON)
 add_subdirectory(zlib-ng)
 
-if(NOT ENABLE_QT_GUI)
 # SDL3
 add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
-endif()

src/core/hle/libraries/libc/libc_cxa.h

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-#define _TIMESPEC_DEFINED
 
 #include <pthread.h>
 #include "common/types.h"

src/core/hle/libraries/libkernel/thread_management.h

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
-#define _TIMESPEC_DEFINED
 
 #include <atomic>
 #include <mutex>

src/core/virtual_memory.cpp

@@ -170,7 +170,8 @@ u64 memory_alloc_aligned(u64 address, u64 size, MemoryMode mode, u64 alignment)
     }
     return ptr;
 #else
-    void* hint_address = reinterpret_cast<void*>(AlignUp(address, alignment));
+    void* hint_address = address == 0 ? reinterpret_cast<void*>(USER_MIN)
+                                      : reinterpret_cast<void*>(AlignUp(address, alignment));
     void* ptr = mmap(hint_address, size, convertMemoryMode(mode), MAP_ANON | MAP_PRIVATE, -1, 0);
     ASSERT(ptr != MAP_FAILED);
     return reinterpret_cast<u64>(ptr);

third-party/CMakeLists.txt

@@ -6,9 +6,6 @@ if (MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
 endif()
 
-# fmtlib
-add_subdirectory(fmt EXCLUDE_FROM_ALL)
-
 # MagicEnum
 add_subdirectory(magic_enum EXCLUDE_FROM_ALL)