Initial commit for auto prx stub generation

Author: igor725

OpenOrbis-tc.cmake

@@ -25,6 +25,14 @@ set(CMAKE_CXX_COMPILER_TARGET "${CMAKE_C_COMPILER_TARGET}" CACHE STRING "" FORCE
 set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY" CACHE STRING "" FORCE)
 set(CMAKE_SYSROOT "${OO_PS4_TOOLCHAIN}" CACHE PATH "" FORCE)
 
+if(CMAKE_HOST_WIN32)
+  set(OO_BINARIES_PATH ${OO_PS4_TOOLCHAIN}/bin/windows)
+elseif(CMAKE_HOST_LINUX)
+  set(OO_BINARIES_PATH ${OO_PS4_TOOLCHAIN}/bin/linux)
+else()
+  message(FATAL_ERROR "Unsupported OS")
+endif()
+
 include_directories(SYSTEM
   ${OO_PS4_TOOLCHAIN}/include
   ${OO_PS4_TOOLCHAIN}/include/c++/v1
@@ -34,7 +42,7 @@ link_directories(BEFORE
   ${OO_PS4_TOOLCHAIN}/lib
 )
 
-add_link_options(-pie -nostartfiles -nodefaultlibs -lc -lc++ -lkernel -fuse-ld=lld${OO_PS4_LINKER_SUFFIX} -Wl,-m,elf_x86_64 -Wl,--eh-frame-hdr "-Wl,--script,${OO_PS4_TOOLCHAIN}/link.x")
+add_link_options(-nostartfiles -nodefaultlibs -lc -lc++ -lkernel -fuse-ld=lld${OO_PS4_LINKER_SUFFIX} -Wl,-m,elf_x86_64 -Wl,--eh-frame-hdr "-Wl,--script,${OO_PS4_TOOLCHAIN}/link.x")
 
 add_compile_options(-nostdinc++ -nostdinc -fPIC -funwind-tables -fshort-wchar)
 
@@ -46,37 +54,46 @@ else()
   add_compile_options(-O3)
 endif()
 
+function(OpenOrbis_AddFSelfCommand TargetProject WorkDir FSelfName TargetSDKVer)
+  set_target_properties(${TargetProject} PROPERTIES OUTPUT_NAME "${FSelfName}" SUFFIX ".elf" PREFIX "")
+
+  set(OUT_TYPE "eboot")
+  set(OUT_EXT "bin")
+
+  if(NOT ${FSelfName} STREQUAL "eboot")
+    set(OUT_TYPE "lib")
+    set(OUT_EXT "prx")
+  endif()
+
+  math(EXPR OO_FWVER "${TargetSDKVer} * 65536")
+
+  # Create object from generated elf file
+  add_custom_command(TARGET ${TargetProject} POST_BUILD COMMAND
+    ${CMAKE_COMMAND} -E env "OO_PS4_TOOLCHAIN=${OO_PS4_TOOLCHAIN}"
+    ${OO_BINARIES_PATH}/create-fself -in "${WorkDir}/${FSelfName}.elf"
+    --out "${WorkDir}/${FSelfName}.oelf" "--${OUT_TYPE}" "${WorkDir}/${FSelfName}.${OUT_EXT}" --paid 0x3800000000000011 --sdkver "${TargetSDKVer}" --fwversion "${OO_FWVER}"
+  )
+
+  unset(OUT_TYPE)
+  unset(OUT_EXT)
+  unset(OO_FWVER)
+endfunction()
+
 function(OpenOrbisPackage_PreProject)
   if(TARGET ${PKG_TITLE_ID})
     message(FATAL_ERROR "Test name collision detected: ${PKG_TITLE_ID}.")
   endif()
 endfunction()
 
 function(OpenOrbisPackage_PostProject path_bin)
-  set_target_properties(${PKG_TITLE_ID} PROPERTIES OUTPUT_NAME "eboot" SUFFIX ".elf" PREFIX "")
-
-  if(CMAKE_HOST_WIN32)
-    set(ORBIS_BIN_PATH ${OO_PS4_TOOLCHAIN}/bin/windows)
-  elseif(CMAKE_HOST_LINUX)
-    set(ORBIS_BIN_PATH ${OO_PS4_TOOLCHAIN}/bin/linux)
-  else()
-    message(FATAL_ERROR "Unsupported OS")
-  endif()
-
   if(OO_PS4_NOPKG)
     set(PKG_SHOULDBUILD "nopkg")
   else()
     set(PKG_SHOULDBUILD "pkg")
   endif()
 
-  math(EXPR OO_FWVER "${PKG_SYSVER} * 65536")
-
   # Create eboot.bin from generated elf file
-  add_custom_command(TARGET ${PKG_TITLE_ID} POST_BUILD COMMAND
-    ${CMAKE_COMMAND} -E env "OO_PS4_TOOLCHAIN=${OO_PS4_TOOLCHAIN}"
-    ${ORBIS_BIN_PATH}/create-fself -in ${path_eboot} "${path_bin}/eboot.elf"
-    --out "${path_bin}/eboot.oelf" --eboot "${path_bin}/eboot.bin" --paid 0x3800000000000011 --sdkver "${PKG_SYSVER}" --fwversion "${OO_FWVER}"
-  )
+  OpenOrbis_AddFSelfCommand(${PKG_TITLE_ID} ${path_bin} "eboot" ${PKG_SYSVER})
   get_filename_component(CURRENT_FOLDER_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
   set(install_dir "${CMAKE_INSTALL_PREFIX}/${CURRENT_FOLDER_NAME}/${PKG_TITLE_ID}")
 
@@ -196,4 +213,6 @@ function(OpenOrbisPackage_PostProject path_bin)
   else()
     message(FATAL_ERROR "Unsupported OS")
   endif()
+
+  unset(install_dir)
 endfunction()

tests/app_data/sce_module/.gitkeep

@@ -1,3 +1,36 @@
+function(create_lib work_dir work_lib_name src_files fw_version inst_path out_lib_name)
+  add_library(${work_lib_name} SHARED ${src_files} ${OO_PS4_TOOLCHAIN}/lib/crtlib.o)
+  OpenOrbis_AddFSelfCommand(${work_lib_name} ${work_dir} ${work_lib_name} ${fw_version})
+  install(FILES ${work_dir}/${work_lib_name}.prx
+    DESTINATION "${inst_path}"
+    RENAME "${out_lib_name}"
+  )
+endfunction()
+
+function(internal_create_stub_libs out_dir fw_version)
+  get_filename_component(curr_folder ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+  set(install_dir "${CMAKE_INSTALL_PREFIX}/${curr_folder}/${PKG_TITLE_ID}")
+
+  # Generate libc.prx stub
+  if(NOT TARGET "c${fw_version}")
+    create_lib(${out_dir} "c${fw_version}" "${OO_PS4_TOOLCHAIN}/src/modules/libc/libc/lib.c" ${fw_version} "${install_dir}/sce_module" "libc.prx")
+  endif()
+
+  # Generate libSceFios2.prx
+  if(NOT TARGET "fios${fw_version}")
+    create_lib(${out_dir} "fios${fw_version}" "${OO_PS4_TOOLCHAIN}/src/modules/libSceFios2/libSceFios2/lib.c" ${fw_version} "${install_dir}/sce_module" "libSceFios2.prx")
+  endif()
+
+  # Generate right.sprx
+  if(NOT TARGET "right${fw_version}")
+    create_lib(${out_dir} "right${fw_version}" "${OO_PS4_TOOLCHAIN}/src/modules/right/right/lib.c" ${fw_version} "${install_dir}/sce_sys/about" "right.sprx")
+    target_link_options("right${fw_version}" PRIVATE "-Wl,--version-script=${OO_PS4_TOOLCHAIN}/src/modules/right/right/right.version")
+  endif()
+
+  unset(install_dir)
+  unset(curr_folder)
+endfunction()
+
 function(create_pkg pkg_title_id fw_major fw_minor src_files)
   set(FW_MAJOR_PADDED 0 PARENT_SCOPE)
   set(FW_MINOR_PADDED 0 PARENT_SCOPE)
@@ -67,7 +100,11 @@ function(create_pkg pkg_title_id fw_major fw_minor src_files)
     PRIVATE FW_VER_MAJOR=${fw_major} FW_VER_MINOR=${fw_minor} FW_VER="${PKG_SYSVER}u"
   )
 
+  target_link_options(${pkg_title_id} PRIVATE -pie)
+
   add_dependencies(${pkg_title_id} CppUTest)
 
+  internal_create_stub_libs(${CMAKE_CURRENT_BINARY_DIR} ${PKG_SYSVER})
+
   OpenOrbisPackage_PostProject(${out_dir})
 endfunction(create_pkg)