From 71496627f90071a2fda809b5460d9c1f99373968 Mon Sep 17 00:00:00 2001 From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com> Date: Sun, 12 Sep 2021 19:39:19 +0200 Subject: Updated docs, moved install guide to INSTALL.md --- doc/cmake_reference.md | 203 +++++++++++++++++++++++++++++++++++++++++++++++++ doc/dev notes.txt | 56 ++++++++++++++ 2 files changed, 259 insertions(+) create mode 100644 doc/cmake_reference.md (limited to 'doc') diff --git a/doc/cmake_reference.md b/doc/cmake_reference.md new file mode 100644 index 0000000..8810ad4 --- /dev/null +++ b/doc/cmake_reference.md @@ -0,0 +1,203 @@ + +# PSn00bSDK CMake reference + +## Setup + +The only requirement to use the SDK in CMake is to set the +`CMAKE_TOOLCHAIN_FILE` variable to `INSTALL_PATH/lib/libpsn00b/cmake/sdk.cmake` +(where `INSTALL_PATH` is the install prefix PSn00bSDK is installed to). This +can be done on the command line (`-DCMAKE_TOOLCHAIN_FILE=...`), in +`CMakeLists.txt` (before calling `project()`) or using a +[preset](https://cmake.org/cmake/help/latest/manual/cmake-presets.7.html). + +It's recommended to put this snippet in `CMakeLists.txt` to automatically set +the toolchain file according to the `PSN00BSDK_LIBS` environment variable: + +```cmake +if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{PSN00BSDK_LIBS}) + set(CMAKE_TOOLCHAIN_FILE $ENV{PSN00BSDK_LIBS}/cmake/sdk.cmake) +endif() +``` + +See the [template](../template/CMakeLists.txt) for an example CMake script +showing how to build a simple project. + +## Targets + +These targets are defined when using PSn00bSDK. There is no need to explicitly +link against any of these, as the helper commands (see below) handle linking +behind the scenes. To avoid conflicts, however, no target should be given any +of these names. + +- `c`, `psxgpu`, `psxgte`, `psxspu`, `psxcd`, `psxsio`, `psxetc`, `psxapi`, `lzp` +- `psn00bsdk_common`, `psn00bsdk_object_lib` +- `psn00bsdk_static_exe` +- `psn00bsdk_dynamic_exe` +- `psn00bsdk_static_lib` +- `psn00bsdk_shared_lib`, `psn00bsdk_module_lib` + +## Commands + +- `psn00bsdk_add_executable( [EXCLUDE_FROM_ALL] [sources...])` + + A wrapper around `add_executable()` to create PS1 executables. Three files + will be generated for each call to this function: + + - `.elf` (regular ELF executable) + - `.exe` (executable converted to the format expected by the PS1) + - `.map` (symbol map file for dynamic linking/introspection) + + The `.exe` and `.map` extensions can be customized by overriding + `PSN00BSDK_EXECUTABLE_SUFFIX` and `PSN00BSDK_SYMBOL_MAP_SUFFIX` prior to + creating the executable. + + The second argument (mandatory) specifies whether the executable is going to + load DLLs at runtime. If set to `STATIC`, $gp-relative addressing (i.e. + reusing the $gp register normally used for DLL addressing) will be enabled, + slightly reducing executable size and RAM usage but breaking compatibility + with the dynamic linker. + +- `psn00bsdk_add_library( [EXCLUDE_FROM_ALL] [sources...])` + + Wraps `add_library()` to create static libraries or dynamically-linked + libraries (DLLs). + + The second argument (mandatory, unlike `add_library()`) specifies the type of + library to create. `STATIC` will create a static library named `lib.a`. + `SHARED` and `MODULE` will compile a DLL, producing the following files (note + that there is no `lib` prefix for DLLs): + + - `.so` (regular ELF shared library) + - `.dll` (raw binary with some ELF headers prepended) + + As with executables, the `.dll` extension can be customized by setting + `PSN00BSDK_SHARED_LIBRARY_SUFFIX`. + +- `psn00bsdk_add_cd_image( [...])` + + Creates a new target that will build a CD image using `mkpsxiso`. + + The first argument is the name of the target to create; next up is the name + of the generated image file (`.bin` + `.cue`). The + third argument is the path to the XML file passed to `mkpsxiso`. + + The XML file is "configured" by CMake, i.e. any `${var}` or `@var@` + expressions are replaced with the values of the respective variables. In + particular `${CD_IMAGE_NAME}` is replaced with the second argument passed to + `psn00bsdk_add_cd_image()`; the file must properly set the output file names + like this: + + ```xml + + + ``` + + Any additional argument is passed through to the underlying call to + `add_custom_target()`, so most of the options supported by + `add_custom_target()` are also supported here. + +## Definitions + +When compiling executables and libraries using the above commands the following +preprocessor macros are automatically `#define`'d: + +- `PLAYSTATION` + + Always set to 1. Can be used to implement different options or code paths for + libraries, so they can target both the host and PS1 (as it won't be defined + when compiling outside of the SDK). + +- `DEBUG` + + Defined and set to 1 in a debug configuration, i.e. when the + `CMAKE_BUILD_TYPE` variable is set to `Debug`. This value is used by the + PSn00bSDK libraries, and should be used in executables, to enable additional + debug logging. + + Note that the default CMake configuration is usually debug, so it's + recommended to specify `-DCMAKE_BUILD_TYPE=Release` to get rid of the logging + overhead in release builds and reduce executable size. + +## Cached settings + +These variables are stored in CMake's cache and can be edited by the project's +build script, from the CMake command line when configuring the project +(`-Dname=value`) or using an editor such as the CMake GUI. + +- `PSN00BSDK_TARGET` (`STRING`) + + The GCC toolchain's target triplet. PSn00bSDK assumes the toolchain targets + `mipsel-unknown-elf` by default, however this can be changed to e.g. use a + MIPS toolchain that was compiled for a slightly-different-but-equivalent + target. + + The following GCC target triplets have been confirmed to work with PSn00bSDK: + + - `mipsel-unknown-elf` + - `mipsel-none-elf` + +- `PSN00BSDK_TC` (`PATH`) + + Path to the GCC toolchain's installation prefix/directory. By default this is + initialized to the value of the `PSN00BSDK_TC` environment variable (if set). + Note that modifying the environment variable after the project has been + configured will *NOT* update this cache entry unless the project's cache is + cleared manually. + + If not set, CMake will attempt to find the toolchain in the `PATH` + environment variable and store its path in this variable (so the search does + not have to be repeated). + + **IMPORTANT**: if the toolchain's target is not `mipsel-unknown-elf`, + `PSN00BSDK_TARGET` must be set regardless of whether or not `PSN00BSDK_TC` is + also set. + +- `PSN00BSDK_LIBGCC` (`FILEPATH`) + + Path to the `libgcc.a` library bundled with the GCC toolchain. The contents + of this library are merged into `libc` when building the SDK, so this + variable is only actually needed when compiling `libpsn00b`. Setting this + variable manually usually isn't necessary as CMake will locate `libgcc.a` + automatically after finding the toolchain. + +## Internal settings + +These settings are not stored in CMake's cache and can only be set from within +the build script. + +- `PSN00BSDK_LIBRARIES` + + List of libraries to link all created targets against. By default this + includes all PSn00bSDK libraries. + +- `PSN00BSDK_EXECUTABLE_SUFFIX`, `PSN00BSDK_SHARED_LIBRARY_SUFFIX`, + `PSN00BSDK_SYMBOL_MAP_SUFFIX` + + File extensions to use for generated PS1 files. The default values are + `.exe`, `.dll` and `.map` respectively. Note that file names and extensions + can be changed anyway when building a CD image. + +## Read-only variables + +- `PSN00BSDK_TOOLS`, `PSN00BSDK_INCLUDE`, `PSN00BSDK_LDSCRIPTS` + + Lists of paths used internally. Should not be set, manipulated or overridden + by scripts. + +- `TOOLCHAIN_NM` + + Path to the `nm` executable used to generate symbol maps. Although not used + internally by CMake, this program is part of the GCC toolchain. + +- `ELF2X`, `ELF2CPE`, `MKPSXISO`, `LZPACK`, `SMXLINK` + + Paths to the PSn00bSDK tools' executables. As no functions are currently + provided for building assets, `LZPACK` and `SMXLINK` can be used with + `add_custom_command()`/`add_custom_target()` to convert models and generate + LZP archives as part of the build pipeline. + +----------------------------------------- +_Last updated on 2021-09-12 by spicyjpeg_ diff --git a/doc/dev notes.txt b/doc/dev notes.txt index 47aa2df..151a441 100644 --- a/doc/dev notes.txt +++ b/doc/dev notes.txt @@ -92,3 +92,59 @@ power operator, not xor): * If you are overriding any of the memory allocation functions, DO NOT ENABLE LINK-TIME OPTIMIZATION. GCC has a long-standing bug with LTO and weak functions written in assembly, also LTO hasn't been tested at all yet. + +Obscure CMake issues and related stuff: + +* Toolchain files are loaded "early" according to the CMake docs. What this +means in practice is that a lot of commands, such as find_*(), won't work +properly in a toolchain script as they rely on variables initialized by the +project() command. The poorly documented solution to this is to move such +commands to a separate file and set CMAKE_PROJECT_INCLUDE to point to it, so +project() will execute it immediately after initialization. + +* There is no way to use multiple toolchains (PS1 + host) in a single project, +even if you use add_subdirectory() to execute multiple project files (which, +confusingly, adds their targets to the parent project rather than treating them +as separate projects). Thankfully though CMake provides support for automating +the build process of independent CMake projects via the ExternalProject module. +Which brings me to the next issue... + +* If you run CPack on a "superbuild" project (i.e. a project that calls +ExternalProject_Add() to configure, compile and install subprojects at build +time), you'll likely run into a weird issue with CPack bundling folders from +your build directory into DEB and RPM packages. This is caused by the DEB/RPM +generators running "cmake --install" in a chroot/fakeroot to prepare the files +to be packaged, which seems to interfere with absolute paths in the project +cache or something like that (?). The only workaround I know of is to use +CPACK_PRE_BUILD_SCRIPTS to trigger a custom script that deletes anything other +than the actual files to be packaged (see cpack/fakeroot_fix.cmake). + +* Depending on how you find external dependencies (find_package(), vcpkg, +pkg-config...), CMake may end up outputting an executable that relies on a DLL +installed system-wide. To correctly install the DLL alongside the executable +you have to specify a regex as follows: + + install( + TARGETS my_executable + RUNTIME_DEPENDENCIES + PRE_EXCLUDE_REGEXES ".*" + PRE_INCLUDE_REGEXES "tinyxml2" + ) + +CMake will scan the executable at install time and copy all the required DLLs +that match the second regex. If no regex is specified CMake will also copy OS +DLLs like libc or msvcrt, which usually isn't the desired behavior. + +* Using interface targets to set include directories can be finicky. Not only +do you have to use generator expressions to conditionally use different paths +depending on whether the targets are installed, but CMake can get confused on +which options to pass to the compiler. I spent hours trying to get CMake to use +-I rather than -isystem for include directories (for some reason GCC would +ignore -isystem completely). I eventually gave up and just set the include +directories manually for each target, and for some reason CMake actually +started passing -I instead of -isystem to GCC. + +* Not a CMake/CPack bug per se, but NSIS is picky about the banner and header +images shown in generated installers. They must be Windows BMP version 3 files +with no alpha channel, no compression and no metadata. They can either be +24-bit RGB or indexed, though it's common to use indexed colors to save space. -- cgit v1.2.3 From 0e3278a087daa25cba541d7c1dae19dfd4e2d422 Mon Sep 17 00:00:00 2001 From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com> Date: Mon, 27 Sep 2021 20:11:10 +0200 Subject: Misc MSVC/CMake fixes, also fixed childexec example --- CMakeLists.txt | 5 ++-- INSTALL.md | 42 +++++++++++++++++++------------- doc/dev notes.txt | 9 +++++++ examples/system/childexec/CMakeLists.txt | 7 ++++++ libpsn00b/cmake/sdk.cmake | 41 +++++++++++++++++++------------ libpsn00b/lzp/compress.c | 10 ++++---- libpsn00b/lzp/crc.c | 8 +++--- libpsn00b/lzp/lzp.c | 32 ++++++++++++------------ libpsn00b/lzp/lzp.h | 18 +++++++------- libpsn00b/lzp/lzqlp.h | 23 ++++++++++------- libpsn00b/lzp/qlp.c | 24 +++++++++--------- tools/lzpack/filelist.h | 7 +++++- tools/lzpack/main.cpp | 30 ++++++++++++----------- tools/smxlink/main.cpp | 4 +++ tools/smxlink/timreader.cpp | 4 +++ tools/util/elf2cpe.c | 4 +++ tools/util/elf2x.c | 9 ++++++- 17 files changed, 172 insertions(+), 105 deletions(-) (limited to 'doc') diff --git a/CMakeLists.txt b/CMakeLists.txt index 71f9acf..fa04b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,9 @@ if(NOT SKIP_DOWNLOAD) ExternalProject_Add( tinyxml2 GIT_REPOSITORY "https://github.com/leethomason/tinyxml2" - CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/install_temp + CMAKE_CACHE_ARGS + -DCMAKE_INSTALL_PREFIX:PATH=${PROJECT_BINARY_DIR}/install_temp + -DCMAKE_MSVC_RUNTIME_LIBRARY:STRING=MultiThreaded$<$:Debug> INSTALL_DIR install_temp ) ExternalProject_Add( @@ -154,7 +156,6 @@ set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/LICENSE.md) set(CPACK_PRE_BUILD_SCRIPTS ${PROJECT_SOURCE_DIR}/cpack/fakeroot_fix.cmake) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.28), cmake (>= 3.21), gcc-mipsel-unknown-elf") set(CPACK_DEBIAN_PACKAGE_SUGGESTS "git") set(CPACK_DEBIAN_PACKAGE_SECTION devel) diff --git a/INSTALL.md b/INSTALL.md index 974ee0a..6547c2b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -11,22 +11,29 @@ tested but should work. install the `build-essential` package provided by most Linux distros. 2. Install Git and CMake. Note that some Linux distros ship relatively old - versions of CMake, so make sure you have at least CMake 3.21. You may also - want to grab [Ninja](https://ninja-build.org) (it is a single executable, you - have to copy it to any directory listed in the `PATH` environment variable) - as a faster alternative to `make`. + versions of CMake, so make sure you have at least CMake 3.21. You will also + need [Ninja](https://ninja-build.org) (it is a single executable, you have to + copy it to any directory listed in the `PATH` environment variable) on + Windows as there is no preinstalled build system; on Linux you can use `make` + instead, but Ninja is still recommended. 3. Build and install a GCC toolchain for `mipsel-unknown-elf`. As GCC is notoriously hard to compile under Windows, you may download a precompiled - version from [Lameguy64's website](http://lameguy64.net?page=psn00bsdk) - and extract it to the root of your C drive instead. See - [toolchain.txt](toolchain.txt) for details on compiling GCC. - -4. Set the `PSN00BSDK_TC` environment variable to point to the location you - installed or extracted the toolchain to. The default is - `C:\Program Files\PSn00bSDK\mips-unknown-elf` on Windows or - `/usr/local/mips-unknown-elf` on Linux; installing to a different path is - not recommended. + version from [Lameguy64's website](http://lameguy64.net?page=psn00bsdk) and + and extract it into Program Files instead. See [toolchain.txt](toolchain.txt) + for details on compiling GCC. + +4. If you chose a non-standard install location for the toolchain, set the + `PSN00BSDK_TC` environment variable to point to the toolchain's root + directory. This step is unnecessary if you installed/extracted the toolchain + into any of these directories: + + - `C:\Program Files\mipsel-unknown-elf` + - `C:\Program Files (x86)\mipsel-unknown-elf` + - `C:\mipsel-unknown-elf` + - `/usr/local/mipsel-unknown-elf` + - `/usr/mipsel-unknown-elf` + - `/opt/mipsel-unknown-elf` 5. Clone/download the PSn00bSDK repo and run the following commands: @@ -55,9 +62,10 @@ with debugging capabilities such as [no$psx](https://problemkaputt.de/psx.htm) ## Building installer packages -CPack can be used to build NSIS-based installers on Windows or DEB/RPM packages -on Linux, plus zipped packages on all platforms. Note that currently none of the -built packages include the GCC toolchain, thus their usefulness is limited. +CPack can be used to build NSIS-based installers, DEB/RPM packages and zipped +releases. Note that currently none of the built packages include the toolchain, +thus their usefulness is limited. Distributing prebuilt releases is discouraged +anyway since PSn00bSDK is still far from being feature-complete. 1. Follow steps 1-4 above to set up the toolchain, then install NSIS on Windows or `dpkg` and `rpm` on Linux. @@ -97,4 +105,4 @@ The toolchain script defines a few CMake macros to create PS1 executables, DLLs and CD images. See the [reference](doc/cmake_reference.md) for details. ----------------------------------------- -_Last updated on 2021-09-12 by spicyjpeg_ +_Last updated on 2021-09-26 by spicyjpeg_ diff --git a/doc/dev notes.txt b/doc/dev notes.txt index 151a441..8fd8d7f 100644 --- a/doc/dev notes.txt +++ b/doc/dev notes.txt @@ -102,6 +102,15 @@ project() command. The poorly documented solution to this is to move such commands to a separate file and set CMAKE_PROJECT_INCLUDE to point to it, so project() will execute it immediately after initialization. +* After executing the toolchain file, CMake generates and attempts to build +several dummy projects to test the compiler. Each of these projects re-includes +the toolchain script (which is why you'll see commands executed multiple times) +and uses the same variable values as the main project, however CMake will *NOT* +pass custom variables through by default. If your toolchain script has options +that can be set via custom variables (like PSN00BSDK_TC and PSN00BSDK_PREFIX in +PSn00bSDK), you'll have to set CMAKE_TRY_COMPILE_PLATFORM_VARIABLES to a list +of variable names to be exported to generated dummy projects. + * There is no way to use multiple toolchains (PS1 + host) in a single project, even if you use add_subdirectory() to execute multiple project files (which, confusingly, adds their targets to the parent project rather than treating them diff --git a/examples/system/childexec/CMakeLists.txt b/examples/system/childexec/CMakeLists.txt index 8092bec..c9983c4 100644 --- a/examples/system/childexec/CMakeLists.txt +++ b/examples/system/childexec/CMakeLists.txt @@ -27,6 +27,13 @@ psn00bsdk_add_executable( psn00bsdk_add_executable(child STATIC ${_child_sources}) #psn00bsdk_add_cd_image(childexec_iso childexec iso.xml DEPENDS parent) +# Relocate the child executable to a non-default address to prevent it from +# overlapping with the main one at 0x80010000. +# NOTE: child executables are not position-independent and can't be relocated +# at runtime. If you need your code to be relocatable (e.g. to load it into a +# dynamically-allocated buffer), consider using a DLL instead. +target_link_options(child PRIVATE -Ttext=0x80030000) + # Make sure the child executable is built before the parent (so it can be # embedded via child_exe.s). add_dependencies(parent child) diff --git a/libpsn00b/cmake/sdk.cmake b/libpsn00b/cmake/sdk.cmake index 82e921c..4c2f330 100644 --- a/libpsn00b/cmake/sdk.cmake +++ b/libpsn00b/cmake/sdk.cmake @@ -22,23 +22,29 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) #set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -# Tell CMake not to run the linker when compiling test programs. This dodges -# missing C++ standard library errors. -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +# Tell CMake not to run the linker when compiling test programs, and to pass +# toolchain settings to the generated test projects. This dodges missing C++ +# standard library errors. +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES PSN00BSDK_TC PSN00BSDK_TARGET) ## Toolchain path setup -# Attempt to find GCC. PSN00BSDK_TC can be left unset if the toolchain can be -# found in the PATH environment variable. +# Attempt to find GCC using a list of common installation locations. +# PSN00BSDK_TC can be left unset if the toolchain can be found in any of these +# or in the PATH environment variable. find_program( _gcc ${PSN00BSDK_TARGET}-gcc HINTS ${PSN00BSDK_TC}/bin ${PSN00BSDK_TC}/../bin + # Same as ${CMAKE_INSTALL_PREFIX}/${PSN00BSDK_TARGET}/bin ${CMAKE_CURRENT_LIST_DIR}/../../../${PSN00BSDK_TARGET}/bin PATHS "C:/Program Files/${PSN00BSDK_TARGET}/bin" + "C:/Program Files (x86)/${PSN00BSDK_TARGET}/bin" "C:/${PSN00BSDK_TARGET}/bin" + /opt/${PSN00BSDK_TARGET}/bin /usr/local/${PSN00BSDK_TARGET}/bin /usr/${PSN00BSDK_TARGET}/bin NO_CACHE REQUIRED @@ -57,18 +63,23 @@ endif() ## Toolchain executables +# ${CMAKE_EXECUTABLE_SUFFIX} seems not to work in toolchain scripts, so we +# can't rely on it to determine the host OS extension for executables. The best +# workaround I found is to extract the extension from the path returned by +# find_program() using a regex. set(_prefix ${_bin}/${PSN00BSDK_TARGET}) +string(REGEX MATCH ".+-gcc(.*)$" _dummy ${_gcc}) -set(CMAKE_ASM_COMPILER ${_prefix}-gcc${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_C_COMPILER ${_prefix}-gcc${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_CXX_COMPILER ${_prefix}-g++${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_AR ${_prefix}-ar${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_LINKER ${_prefix}-ld${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_RANLIB ${_prefix}-ranlib${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_OBJCOPY ${_prefix}-objcopy${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_SIZE ${_prefix}-size${CMAKE_EXECUTABLE_SUFFIX}) -set(CMAKE_STRIP ${_prefix}-strip${CMAKE_EXECUTABLE_SUFFIX}) -set(TOOLCHAIN_NM ${_prefix}-nm${CMAKE_EXECUTABLE_SUFFIX}) +set(CMAKE_ASM_COMPILER ${_prefix}-gcc${CMAKE_MATCH_1}) +set(CMAKE_C_COMPILER ${_prefix}-gcc${CMAKE_MATCH_1}) +set(CMAKE_CXX_COMPILER ${_prefix}-g++${CMAKE_MATCH_1}) +set(CMAKE_AR ${_prefix}-ar${CMAKE_MATCH_1}) +set(CMAKE_LINKER ${_prefix}-ld${CMAKE_MATCH_1}) +set(CMAKE_RANLIB ${_prefix}-ranlib${CMAKE_MATCH_1}) +set(CMAKE_OBJCOPY ${_prefix}-objcopy${CMAKE_MATCH_1}) +set(CMAKE_SIZE ${_prefix}-size${CMAKE_MATCH_1}) +set(CMAKE_STRIP ${_prefix}-strip${CMAKE_MATCH_1}) +set(TOOLCHAIN_NM ${_prefix}-nm${CMAKE_MATCH_1}) ## SDK setup diff --git a/libpsn00b/lzp/compress.c b/libpsn00b/lzp/compress.c index 5f2b78c..5969dd6 100644 --- a/libpsn00b/lzp/compress.c +++ b/libpsn00b/lzp/compress.c @@ -107,7 +107,7 @@ int get_penalty(int a, int b) { } -int lzCompress(void* outBuff, void* inBuff, int inSize, int level) { +int lzCompress(void* outBuff, const void* inBuff, int inSize, int level) { #if LZP_USE_MALLOC == FALSE int head[HASH1_SIZE+HASH2_SIZE]; @@ -347,7 +347,7 @@ void lzResetHashSizes() { #endif // LZP_NO_COMPRESS -int lzDecompress(void* outBuff, void* inBuff, int inSize) { +int lzDecompress(void* outBuff, const void* inBuff, int inSize) { int p=0; int len; @@ -355,7 +355,7 @@ int lzDecompress(void* outBuff, void* inBuff, int inSize) { int s; int windowSize; - inPtr = (unsigned char*)inBuff; + inPtr = (const unsigned char*)inBuff; outPtr = (unsigned char*)outBuff; inBytes = 0; outBytes = 0; @@ -408,7 +408,7 @@ int lzDecompress(void* outBuff, void* inBuff, int inSize) { } -int lzDecompressLen(void* outBuff, int outSize, void* inBuff, int inSize) { +int lzDecompressLen(void* outBuff, int outSize, const void* inBuff, int inSize) { int p=0; int len; @@ -416,7 +416,7 @@ int lzDecompressLen(void* outBuff, int outSize, void* inBuff, int inSize) { int s; int windowSize; - inPtr = (unsigned char*)inBuff; + inPtr = (const unsigned char*)inBuff; outPtr = (unsigned char*)outBuff; inBytes = 0; outBytes = 0; diff --git a/libpsn00b/lzp/crc.c b/libpsn00b/lzp/crc.c index c5ab702..7cc7bf3 100644 --- a/libpsn00b/lzp/crc.c +++ b/libpsn00b/lzp/crc.c @@ -49,7 +49,7 @@ void initTable32(unsigned int* table) { } -unsigned short lzCRC16(void* buff, int bytes, unsigned short crc) { +unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc) { int i; unsigned short tmp, short_c; @@ -59,7 +59,7 @@ unsigned short lzCRC16(void* buff, int bytes, unsigned short crc) { for(i=0; i> 8) ^ crcTable[tmp&0xff]; @@ -70,10 +70,10 @@ unsigned short lzCRC16(void* buff, int bytes, unsigned short crc) { } -unsigned int lzCRC32(void* buff, int bytes, unsigned int crc) { +unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc) { int i; - unsigned char* byteBuff = (unsigned char*)buff; + unsigned char* byteBuff = (const unsigned char*)buff; unsigned int byte; unsigned int crcTable[256]; diff --git a/libpsn00b/lzp/lzp.c b/libpsn00b/lzp/lzp.c index 1f4fea4..9f2da48 100644 --- a/libpsn00b/lzp/lzp.c +++ b/libpsn00b/lzp/lzp.c @@ -17,7 +17,7 @@ static char* lcase(char* text) { } -int lzpSearchFile(const char* fileName, void* lzpack) { +int lzpSearchFile(const char* fileName, const LZP_HEAD* lzpack) { int i; char searchName[16]; @@ -27,8 +27,8 @@ int lzpSearchFile(const char* fileName, void* lzpack) { strcpy(searchName, fileName); lcase(searchName); - fileEntry = (LZP_FILE*)(lzpack+4); - for(i=0; i<((LZP_HEAD*)lzpack)->numFiles; i++) { + fileEntry = (LZP_FILE*)(((const char*)lzpack)+sizeof(LZP_HEAD)); + for(i=0; i<(lzpack->numFiles); i++) { strcpy(compareName, fileEntry[i].fileName); lcase(compareName); @@ -42,44 +42,44 @@ int lzpSearchFile(const char* fileName, void* lzpack) { } -LZP_FILE* lzpFileEntry(void* lzpack, int fileNum) { +const LZP_FILE* lzpFileEntry(const LZP_HEAD* lzpack, int fileNum) { - if (strncmp("LZP", ((LZP_HEAD*)lzpack)->id, 3) != 0) + if (strncmp("LZP", lzpack->id, 3) != 0) return(NULL); - if ((fileNum < 0) || (fileNum > (((LZP_HEAD*)lzpack)->numFiles-1))) + if ((fileNum < 0) || (fileNum > (lzpack->numFiles-1))) return(NULL); - return(&((LZP_FILE*)(lzpack+4))[fileNum]); + return &((LZP_FILE*)(((const char*)lzpack)+sizeof(LZP_HEAD)))[fileNum]; } -int lzpFileSize(void* lzpack, int fileNum) { +int lzpFileSize(const LZP_HEAD* lzpack, int fileNum) { - if (strncmp("LZP", ((LZP_HEAD*)lzpack)->id, 3) != 0) + if (strncmp("LZP", lzpack->id, 3) != 0) return 0; - if ((fileNum < 0) || (fileNum > (((LZP_HEAD*)lzpack)->numFiles-1))) + if ((fileNum < 0) || (fileNum > (lzpack->numFiles-1))) return 0; - return ((LZP_FILE*)(lzpack+4))[fileNum].fileSize; + return ((LZP_FILE*)(((const char*)lzpack)+sizeof(LZP_HEAD)))[fileNum].fileSize; } -int lzpUnpackFile(void* buff, void* lzpack, int fileNum) { +int lzpUnpackFile(void* buff, const LZP_HEAD* lzpack, int fileNum) { - LZP_FILE* fileEntry = &((LZP_FILE*)(lzpack+4))[fileNum]; + LZP_FILE* fileEntry = &((LZP_FILE*)(((const char*)lzpack)+sizeof(LZP_HEAD)))[fileNum]; int unpackedSize; // Check ID header - if (strncmp("LZP", ((LZP_HEAD*)lzpack)->id, 3) != 0) + if (strncmp("LZP", lzpack->id, 3) != 0) return(LZP_ERR_INVALID_PACK); // Do a CRC16 check of the compressed data's integrity - if (lzCRC32(lzpack+fileEntry->offset, fileEntry->packedSize, LZP_CRC32_REMAINDER) != fileEntry->crc) + if (lzCRC32(((const char*)lzpack)+fileEntry->offset, fileEntry->packedSize, LZP_CRC32_REMAINDER) != fileEntry->crc) return(LZP_ERR_CRC_MISMATCH); // Decompress data to the specified address - unpackedSize = lzDecompress(buff, lzpack+fileEntry->offset, fileEntry->packedSize); + unpackedSize = lzDecompress(buff, ((const char*)lzpack)+fileEntry->offset, fileEntry->packedSize); if (unpackedSize < 0) return(unpackedSize); diff --git a/libpsn00b/lzp/lzp.h b/libpsn00b/lzp/lzp.h index ffd7933..cfeeb72 100644 --- a/libpsn00b/lzp/lzp.h +++ b/libpsn00b/lzp/lzp.h @@ -111,7 +111,7 @@ extern "C" { * * \returns The size of the compressed data in bytes. */ -int lzCompress(void* outBuff, void* inBuff, int inSize, int level); +int lzCompress(void* outBuff, const void* inBuff, int inSize, int level); /*! Decompress a compressed block of data. * @@ -130,9 +130,9 @@ int lzCompress(void* outBuff, void* inBuff, int inSize, int level); * \returns Size of decompressed data in bytes or LZP_ERR_DECOMPRESS if a * decompression error occurred. */ -int lzDecompress(void* outBuff, void* inBuff, int inSize); +int lzDecompress(void* outBuff, const void* inBuff, int inSize); -int lzDecompressLen(void* outBuff, int outSize, void* inBuff, int inSize); +int lzDecompressLen(void* outBuff, int outSize, const void* inBuff, int inSize); /*! Sets the sizes of hash tables for data compression. * @@ -162,7 +162,7 @@ void lzResetHashSizes(); * * \returns CRC16 hash of specified buffer. */ -unsigned short lzCRC16(void* buff, int bytes, unsigned short crc); +unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc); /*! Calculates a CRC32 hash of the specified buffer. * @@ -172,7 +172,7 @@ unsigned short lzCRC16(void* buff, int bytes, unsigned short crc); * * \returns CRC32 hash of specified buffer. */ -unsigned int lzCRC32(void* buff, int bytes, unsigned int crc); +unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc); /*! @} */ @@ -189,9 +189,9 @@ unsigned int lzCRC32(void* buff, int bytes, unsigned int crc); * * \returns File index of found file or one of \ref libraryErrorCodes if an error occurred. */ -int lzpSearchFile(const char* fileName, void* lzpack); +int lzpSearchFile(const char* fileName, const LZP_HEAD* lzpack); -int lzpFileSize(void* lzpack, int fileNum); +int lzpFileSize(const LZP_HEAD* lzpack, int fileNum); /*! Get a pointer to a file entry inside of an LZP archive. * @@ -200,7 +200,7 @@ int lzpFileSize(void* lzpack, int fileNum); * * \returns A pointer to an LZP_FILE struct or NULL if an error occurred. */ -LZP_FILE* lzpFileEntry(void* lzpack, int fileNum); +const LZP_FILE* lzpFileEntry(const LZP_HEAD* lzpack, int fileNum); /*! Unpacks a file from an LZP archive to the specified memory buffer. * @@ -210,7 +210,7 @@ LZP_FILE* lzpFileEntry(void* lzpack, int fileNum); * * \returns Size of decompressed file in bytes or one of \ref libraryErrorCodes if an error occurred. */ -int lzpUnpackFile(void* buff, void* lzpack, int fileNum); +int lzpUnpackFile(void* buff, const LZP_HEAD* lzpack, int fileNum); /*! @} */ diff --git a/libpsn00b/lzp/lzqlp.h b/libpsn00b/lzp/lzqlp.h index fae6438..5b70b40 100644 --- a/libpsn00b/lzp/lzqlp.h +++ b/libpsn00b/lzp/lzqlp.h @@ -1,6 +1,11 @@ #ifndef _QLP_H #define _QLP_H +#include +#ifdef _WIN32 +#include +#endif + #define PACK_ERR_NONE 0 #define PACK_ERR_INVALID -1 #define PACK_ERR_NOTFOUND -2 @@ -8,19 +13,19 @@ #define PACK_ERR_READ_FAULT -4 typedef struct { - char id[3]; - unsigned char numfiles; + char id[3]; + u_char numfiles; } QLP_HEAD; typedef struct { - char name[16]; - unsigned int size; - unsigned int offs; + char name[16]; + u_int size; + u_int offs; } QLP_FILE; -int qlpFileCount(void* qlpfile); -QLP_FILE* qlpFileEntry(int index, void* qlpfile); -void* qlpFileAddr(int index, void* qlpfile); -int qlpFindFile(char* fileName, void* qlpfile); +int qlpFileCount(const QLP_HEAD* qlpfile); +const QLP_FILE* qlpFileEntry(int index, const QLP_HEAD* qlpfile); +const void* qlpFileAddr(int index, const QLP_HEAD* qlpfile); +int qlpFindFile(char* fileName, const QLP_HEAD* qlpfile); #endif // _QLP_H \ No newline at end of file diff --git a/libpsn00b/lzp/qlp.c b/libpsn00b/lzp/qlp.c index 3be8356..e54f99f 100644 --- a/libpsn00b/lzp/qlp.c +++ b/libpsn00b/lzp/qlp.c @@ -14,34 +14,34 @@ static char* lcase(char* str) { } -int qlpFileCount(void* qlpfile) { +int qlpFileCount(const QLP_HEAD* qlpfile) { - if (strncmp(((QLP_HEAD*)qlpfile)->id, "QLP", 3) != 0) + if (strncmp(qlpfile->id, "QLP", 3) != 0) return(PACK_ERR_INVALID); - return(((QLP_HEAD*)qlpfile)->numfiles); + return(qlpfile->numfiles); } -QLP_FILE* qlpFileEntry(int index, void* qlpfile) { +const QLP_FILE* qlpFileEntry(int index, const QLP_HEAD* qlpfile) { - if (strncmp(((QLP_HEAD*)qlpfile)->id, "QLP", 3) != 0) + if (strncmp(qlpfile->id, "QLP", 3) != 0) return(NULL); - if (index > ((QLP_HEAD*)qlpfile)->numfiles) + if (index > qlpfile->numfiles) return(NULL); - return(&((QLP_FILE*)(qlpfile+4))[index]); + return(&((QLP_FILE*)(((const char*)qlpfile)+sizeof(QLP_HEAD)))[index]); } -void* qlpFileAddr(int index, void* qlpfile) { +const void* qlpFileAddr(int index, const QLP_HEAD* qlpfile) { - return( qlpfile+((QLP_FILE*)(qlpfile+4))[index].offs ); + return( ((const char*)qlpfile)+((QLP_FILE*)(((const char*)qlpfile)+sizeof(QLP_HEAD)))[index].offs ); } -int qlpFindFile(char* fileName, void* qlpfile) { +int qlpFindFile(char* fileName, const QLP_HEAD* qlpfile) { int i; char nameBuff[2][16]; @@ -49,9 +49,9 @@ int qlpFindFile(char* fileName, void* qlpfile) { strcpy(nameBuff[0], fileName); lcase(nameBuff[0]); - for(i=0; i<((QLP_HEAD*)qlpfile)->numfiles; i++) { + for(i=0; i<(qlpfile->numfiles); i++) { - strcpy(nameBuff[1], ((QLP_FILE*)(qlpfile+4))[i].name); + strcpy(nameBuff[1], ((QLP_FILE*)(((const char*)qlpfile)+sizeof(QLP_HEAD)))[i].name); lcase(nameBuff[1]); if (strcmp(nameBuff[0], nameBuff[1]) == 0) diff --git a/tools/lzpack/filelist.h b/tools/lzpack/filelist.h index 5351335..f6ad478 100644 --- a/tools/lzpack/filelist.h +++ b/tools/lzpack/filelist.h @@ -4,9 +4,14 @@ #include #include #include -#include #include +#ifdef WIN32 +#include +#else +#include +#endif + #ifndef MAX_PATH #define MAX_PATH PATH_MAX #endif diff --git a/tools/lzpack/main.cpp b/tools/lzpack/main.cpp index e57117e..f684d18 100644 --- a/tools/lzpack/main.cpp +++ b/tools/lzpack/main.cpp @@ -151,11 +151,10 @@ int main(int argc, const char* argv[]) { int CreateLZPfile(const char* packFile, FileListClass* fileList) { FILE* packp; - LZP_FILE entry[fileList->EntryCount()]; + LZP_FILE* entry=new LZP_FILE[fileList->EntryCount()]; int overallSize=0; int overallPackedSize=0; - packp = fopen(packFile, "wb"); fseek(packp, sizeof(LZP_HEAD)+(sizeof(LZP_FILE)*fileList->EntryCount()), SEEK_SET); @@ -179,6 +178,7 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { printf("ERROR: Entry '%s' has more than 15 characters.\n", name); fclose(packp); unlink(packFile); + delete entry; return(0); @@ -199,13 +199,13 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { int fileSize = ftell(fp); fseek(fp, 0, SEEK_SET); - void* fileBuff = malloc(fileSize); + char* fileBuff = new char[fileSize]; fread(fileBuff, fileSize, 1, fp); fclose(fp); - void* compBuff = malloc(fileSize+16384); + char* compBuff = new char[fileSize+16384]; int compSize = lzCompress(compBuff, fileBuff, fileSize, 2); @@ -216,8 +216,8 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { fwrite(compBuff, compSize, 1, packp); - free(compBuff); - free(fileBuff); + delete compBuff; + delete fileBuff; printf("Ok. (%.02f%%)\n", 100.f*((float)compSize/fileSize)); @@ -238,7 +238,7 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { fwrite(entry, sizeof(LZP_FILE), fileList->EntryCount(), packp); fclose(packp); - + delete entry; printf("Packed %d file(s) totaling %d bytes (%.02f%% compression ratio).\n", fileList->EntryCount(), @@ -255,7 +255,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { FILE* packp; QLP_HEAD head; - QLP_FILE fileEntry[fileList->EntryCount()]; + QLP_FILE* fileEntry=new QLP_FILE[fileList->EntryCount()]; strncpy(head.id, "QLP", 3); head.numFiles = fileList->EntryCount(); @@ -285,6 +285,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { printf("ERROR: Entry '%s' has more than 15 characters.\n", name); fclose(packp); unlink(packFile); + delete fileEntry; return(0); @@ -315,7 +316,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { FILE* fp = fopen(fileList->Entry(i)->fileName, "rb"); int bytesCopied = 0; - void* copyBuff = malloc(BUFF_SIZE); + char* copyBuff = new char[BUFF_SIZE]; while(!feof(fp)) { @@ -327,7 +328,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { } - free(copyBuff); + delete copyBuff; fclose(fp); fileEntry[i].fileSize = bytesCopied; @@ -344,6 +345,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { fwrite(fileEntry, sizeof(QLP_FILE), head.numFiles, packp); fclose(packp); + delete fileEntry; return(true); @@ -402,7 +404,7 @@ int CreatePCKfile(const char* packFile, FileListClass* fileList) { } FILE* fp = fopen(fileList->Entry(i)->fileName, "rb"); - void* buff = malloc(BUFF_SIZE); + char* buff = new char[BUFF_SIZE]; int bytesTotal = 0; @@ -415,18 +417,18 @@ int CreatePCKfile(const char* packFile, FileListClass* fileList) { } fclose(fp); - free(buff); + delete buff; toc.file[i].size = bytesTotal; if ((2048*((ftell(packp)+2047)/2048)) != ftell(packp)) { int pad = (2048*(((ftell(packp)%2048)+2047)/2048))-(ftell(packp)%2048); - char padding[pad]; + char* padding = new char[pad]; memset(padding, 0x00, pad); fwrite(padding, pad, 1, packp); - + delete padding; } printf("Done.\n"); diff --git a/tools/smxlink/main.cpp b/tools/smxlink/main.cpp index 8072274..d58f36a 100644 --- a/tools/smxlink/main.cpp +++ b/tools/smxlink/main.cpp @@ -15,6 +15,10 @@ //#include #include "timreader.h" +#ifdef WIN32 +#define strcasecmp _stricmp +#endif + #define VERSION "0.25b" namespace param diff --git a/tools/smxlink/timreader.cpp b/tools/smxlink/timreader.cpp index a8fba94..5116f52 100644 --- a/tools/smxlink/timreader.cpp +++ b/tools/smxlink/timreader.cpp @@ -2,6 +2,10 @@ #include #include "timreader.h" +#ifdef WIN32 +#define strcasecmp _stricmp +#endif + int GetTimCoords(const char* fileName, TIM_COORDS *coords) { FILE* fp = fopen(fileName, "rb"); diff --git a/tools/util/elf2cpe.c b/tools/util/elf2cpe.c index 4379f4a..46b0a37 100644 --- a/tools/util/elf2cpe.c +++ b/tools/util/elf2cpe.c @@ -3,6 +3,10 @@ #include #include "elf.h" +#ifdef WIN32 +#define strcasecmp _stricmp +#endif + #define MAX_prg_entry_count 128 #ifndef false diff --git a/tools/util/elf2x.c b/tools/util/elf2x.c index 26ec9a3..9a7c126 100644 --- a/tools/util/elf2x.c +++ b/tools/util/elf2x.c @@ -6,6 +6,10 @@ #include #include "elf.h" +#ifdef WIN32 +#define strcasecmp _stricmp +#endif + #define MAX_prg_entry_count 128 #define true (1) #define false (0) @@ -233,9 +237,12 @@ int main(int argc, char** argv) { exe.params.t_size = exe_tsize; exe.params.pc0 = head.prg_entry_addr; + // Some later PAL BIOS versions seem to actually verify the license string + // in the executable (despite what the nocash docs claim) and display the + // dreaded "insert PlayStation CD-ROM" screen if it's not valid. strncpy( exe.header, "PS-X EXE", 8 ); strcpy( exe.license, - "Not Licensed or Endorsed by Sony Computer Entertainment Inc." ); + "Sony Computer Entertainment Inc. for Europe area" ); strcpy( exe.pad2, "Built using GCC and PSn00bSDK libraries" ); -- cgit v1.2.3 From 49ea4e7561980d79ec3bed869982852b45b597e8 Mon Sep 17 00:00:00 2001 From: spicyjpeg <88942473+spicyjpeg@users.noreply.github.com> Date: Mon, 27 Sep 2021 22:27:17 +0200 Subject: Updated changelog and files missing from last commit --- changelog.txt | 16 ++++++++++++++++ doc/cmake_reference.md | 6 +++++- examples/demos/n00bdemo/data.h | 4 +++- examples/demos/n00bdemo/data.s.template | 6 +++--- examples/demos/n00bdemo/main.c | 6 ++++-- libpsn00b/cmake/internal_setup.cmake | 3 +++ libpsn00b/include/lzp/lzp.h | 18 +++++++++--------- libpsn00b/include/lzp/lzqlp.h | 23 ++++++++++++++--------- libpsn00b/lzp/bit.c | 2 +- libpsn00b/lzp/bit.h | 2 +- libpsn00b/lzp/crc.c | 6 +++--- tools/lzpack/main.cpp | 18 +++++++++--------- 12 files changed, 71 insertions(+), 39 deletions(-) (limited to 'doc') diff --git a/changelog.txt b/changelog.txt index 03d2d10..046f4fe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -2,6 +2,22 @@ PSn00bSDK changelog Items that are lower in the log are more recently implemented. +09-27-2021 by spicyjpeg: + +* liblzp, tools: Fixed tools not building on MSVC and cleaned up LZP API + declarations (replaced meaningless void* pointers with proper types). + +* libpsn00b: Added missing PSN00BSDK_VERSION CMake variable. + +* examples: Fixed childexec (parent.exe) example crashing due to the child + executable not being relocated in the new build script. Patched n00bdemo to + suppress liblzp pointer type warnings. + +* Fixed another MSVC linker error when building tinyxml2 automatically, as well + as various toolchain/compiler test errors sometimes thrown by CMake. Updated + INSTALL.md with more details. + + 09-13-2021 by spicyjpeg: * Migrated libpsn00b, tools, examples and template to CMake, added a top-level diff --git a/doc/cmake_reference.md b/doc/cmake_reference.md index 8810ad4..3b586ab 100644 --- a/doc/cmake_reference.md +++ b/doc/cmake_reference.md @@ -182,6 +182,10 @@ the build script. ## Read-only variables +- `PSN00BSDK_VERSION` + + The SDK's version number (`major.minor.patch`). + - `PSN00BSDK_TOOLS`, `PSN00BSDK_INCLUDE`, `PSN00BSDK_LDSCRIPTS` Lists of paths used internally. Should not be set, manipulated or overridden @@ -200,4 +204,4 @@ the build script. LZP archives as part of the build pipeline. ----------------------------------------- -_Last updated on 2021-09-12 by spicyjpeg_ +_Last updated on 2021-09-27 by spicyjpeg_ diff --git a/examples/demos/n00bdemo/data.h b/examples/demos/n00bdemo/data.h index 3be0e3d..9e64ea1 100644 --- a/examples/demos/n00bdemo/data.h +++ b/examples/demos/n00bdemo/data.h @@ -1,7 +1,9 @@ #ifndef _DATA_H #define _DATA_H -extern unsigned char lz_resources[]; +extern unsigned char _lz_resources[]; + +#define lz_resources ((const LZP_HEAD*) _lz_resources) /*extern unsigned char smd_mtekdisk[]; extern unsigned char smd_mtektext[]; diff --git a/examples/demos/n00bdemo/data.s.template b/examples/demos/n00bdemo/data.s.template index a7237cd..9fbef2e 100644 --- a/examples/demos/n00bdemo/data.s.template +++ b/examples/demos/n00bdemo/data.s.template @@ -1,8 +1,8 @@ .section .data -.global lz_resources -.type lz_resources, @object -lz_resources: +.global _lz_resources +.type _lz_resources, @object +_lz_resources: .incbin "${PROJECT_BINARY_DIR}/data.lzp" #.global smd_mtekdisk diff --git a/examples/demos/n00bdemo/main.c b/examples/demos/n00bdemo/main.c index fcd38b8..ba21d88 100644 --- a/examples/demos/n00bdemo/main.c +++ b/examples/demos/n00bdemo/main.c @@ -85,11 +85,12 @@ void loadTextures() { Unpack textures from an embedded LZP archive and upload them to VRAM. */ int i; - int *tex_buff,*ttim,j; + int *ttim,j; + QLP_HEAD *tex_buff; TIM_IMAGE tim; i = lzpSearchFile( "textures", lz_resources ); - tex_buff = (int*)malloc( lzpFileSize( lz_resources, i ) ); + tex_buff = (QLP_HEAD*)malloc( lzpFileSize( lz_resources, i ) ); lzpUnpackFile( tex_buff, lz_resources, i ); @@ -148,6 +149,7 @@ void loadTextures() { font_tpage = getTPage( 0, 1, tim.prect->x, tim.prect->y )|0x200; font_clut = getClut( tim.crect->x, tim.crect->y ); + free( tex_buff ); } void unpackModels() { diff --git a/libpsn00b/cmake/internal_setup.cmake b/libpsn00b/cmake/internal_setup.cmake index e9423a4..e3d4be7 100644 --- a/libpsn00b/cmake/internal_setup.cmake +++ b/libpsn00b/cmake/internal_setup.cmake @@ -7,6 +7,9 @@ cmake_minimum_required(VERSION 3.21) include(GNUInstallDirs) +# IMPORTANT TODO: set a version number +set(PSN00BSDK_VERSION 0.1.0) + ## Settings (can be overridden by projects) set(PSN00BSDK_EXECUTABLE_SUFFIX ".exe") diff --git a/libpsn00b/include/lzp/lzp.h b/libpsn00b/include/lzp/lzp.h index ffd7933..cfeeb72 100644 --- a/libpsn00b/include/lzp/lzp.h +++ b/libpsn00b/include/lzp/lzp.h @@ -111,7 +111,7 @@ extern "C" { * * \returns The size of the compressed data in bytes. */ -int lzCompress(void* outBuff, void* inBuff, int inSize, int level); +int lzCompress(void* outBuff, const void* inBuff, int inSize, int level); /*! Decompress a compressed block of data. * @@ -130,9 +130,9 @@ int lzCompress(void* outBuff, void* inBuff, int inSize, int level); * \returns Size of decompressed data in bytes or LZP_ERR_DECOMPRESS if a * decompression error occurred. */ -int lzDecompress(void* outBuff, void* inBuff, int inSize); +int lzDecompress(void* outBuff, const void* inBuff, int inSize); -int lzDecompressLen(void* outBuff, int outSize, void* inBuff, int inSize); +int lzDecompressLen(void* outBuff, int outSize, const void* inBuff, int inSize); /*! Sets the sizes of hash tables for data compression. * @@ -162,7 +162,7 @@ void lzResetHashSizes(); * * \returns CRC16 hash of specified buffer. */ -unsigned short lzCRC16(void* buff, int bytes, unsigned short crc); +unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc); /*! Calculates a CRC32 hash of the specified buffer. * @@ -172,7 +172,7 @@ unsigned short lzCRC16(void* buff, int bytes, unsigned short crc); * * \returns CRC32 hash of specified buffer. */ -unsigned int lzCRC32(void* buff, int bytes, unsigned int crc); +unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc); /*! @} */ @@ -189,9 +189,9 @@ unsigned int lzCRC32(void* buff, int bytes, unsigned int crc); * * \returns File index of found file or one of \ref libraryErrorCodes if an error occurred. */ -int lzpSearchFile(const char* fileName, void* lzpack); +int lzpSearchFile(const char* fileName, const LZP_HEAD* lzpack); -int lzpFileSize(void* lzpack, int fileNum); +int lzpFileSize(const LZP_HEAD* lzpack, int fileNum); /*! Get a pointer to a file entry inside of an LZP archive. * @@ -200,7 +200,7 @@ int lzpFileSize(void* lzpack, int fileNum); * * \returns A pointer to an LZP_FILE struct or NULL if an error occurred. */ -LZP_FILE* lzpFileEntry(void* lzpack, int fileNum); +const LZP_FILE* lzpFileEntry(const LZP_HEAD* lzpack, int fileNum); /*! Unpacks a file from an LZP archive to the specified memory buffer. * @@ -210,7 +210,7 @@ LZP_FILE* lzpFileEntry(void* lzpack, int fileNum); * * \returns Size of decompressed file in bytes or one of \ref libraryErrorCodes if an error occurred. */ -int lzpUnpackFile(void* buff, void* lzpack, int fileNum); +int lzpUnpackFile(void* buff, const LZP_HEAD* lzpack, int fileNum); /*! @} */ diff --git a/libpsn00b/include/lzp/lzqlp.h b/libpsn00b/include/lzp/lzqlp.h index fae6438..5b70b40 100644 --- a/libpsn00b/include/lzp/lzqlp.h +++ b/libpsn00b/include/lzp/lzqlp.h @@ -1,6 +1,11 @@ #ifndef _QLP_H #define _QLP_H +#include +#ifdef _WIN32 +#include +#endif + #define PACK_ERR_NONE 0 #define PACK_ERR_INVALID -1 #define PACK_ERR_NOTFOUND -2 @@ -8,19 +13,19 @@ #define PACK_ERR_READ_FAULT -4 typedef struct { - char id[3]; - unsigned char numfiles; + char id[3]; + u_char numfiles; } QLP_HEAD; typedef struct { - char name[16]; - unsigned int size; - unsigned int offs; + char name[16]; + u_int size; + u_int offs; } QLP_FILE; -int qlpFileCount(void* qlpfile); -QLP_FILE* qlpFileEntry(int index, void* qlpfile); -void* qlpFileAddr(int index, void* qlpfile); -int qlpFindFile(char* fileName, void* qlpfile); +int qlpFileCount(const QLP_HEAD* qlpfile); +const QLP_FILE* qlpFileEntry(int index, const QLP_HEAD* qlpfile); +const void* qlpFileAddr(int index, const QLP_HEAD* qlpfile); +int qlpFindFile(char* fileName, const QLP_HEAD* qlpfile); #endif // _QLP_H \ No newline at end of file diff --git a/libpsn00b/lzp/bit.c b/libpsn00b/lzp/bit.c index aefa45d..9678357 100644 --- a/libpsn00b/lzp/bit.c +++ b/libpsn00b/lzp/bit.c @@ -3,7 +3,7 @@ // Bit I/O // -unsigned char* inPtr = 0; +const unsigned char* inPtr = 0; int inBytes = 0; unsigned char* outPtr = 0; int outBytes = 0; diff --git a/libpsn00b/lzp/bit.h b/libpsn00b/lzp/bit.h index ff71025..321160a 100644 --- a/libpsn00b/lzp/bit.h +++ b/libpsn00b/lzp/bit.h @@ -1,7 +1,7 @@ #ifndef _LZP_BIT_H #define _LZP_BIT_H -extern unsigned char* inPtr; +extern const unsigned char* inPtr; extern int inBytes; extern unsigned char* outPtr; extern int outBytes; diff --git a/libpsn00b/lzp/crc.c b/libpsn00b/lzp/crc.c index 7cc7bf3..3c1ae57 100644 --- a/libpsn00b/lzp/crc.c +++ b/libpsn00b/lzp/crc.c @@ -73,9 +73,9 @@ unsigned short lzCRC16(const void* buff, int bytes, unsigned short crc) { unsigned int lzCRC32(const void* buff, int bytes, unsigned int crc) { int i; - unsigned char* byteBuff = (const unsigned char*)buff; - unsigned int byte; - unsigned int crcTable[256]; + const unsigned char* byteBuff = (const unsigned char*)buff; + unsigned int byte; + unsigned int crcTable[256]; initTable32(crcTable); diff --git a/tools/lzpack/main.cpp b/tools/lzpack/main.cpp index f684d18..506b76c 100644 --- a/tools/lzpack/main.cpp +++ b/tools/lzpack/main.cpp @@ -178,7 +178,7 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { printf("ERROR: Entry '%s' has more than 15 characters.\n", name); fclose(packp); unlink(packFile); - delete entry; + delete[] entry; return(0); @@ -216,8 +216,8 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { fwrite(compBuff, compSize, 1, packp); - delete compBuff; - delete fileBuff; + delete[] compBuff; + delete[] fileBuff; printf("Ok. (%.02f%%)\n", 100.f*((float)compSize/fileSize)); @@ -238,7 +238,7 @@ int CreateLZPfile(const char* packFile, FileListClass* fileList) { fwrite(entry, sizeof(LZP_FILE), fileList->EntryCount(), packp); fclose(packp); - delete entry; + delete[] entry; printf("Packed %d file(s) totaling %d bytes (%.02f%% compression ratio).\n", fileList->EntryCount(), @@ -285,7 +285,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { printf("ERROR: Entry '%s' has more than 15 characters.\n", name); fclose(packp); unlink(packFile); - delete fileEntry; + delete[] fileEntry; return(0); @@ -328,7 +328,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { } - delete copyBuff; + delete[] copyBuff; fclose(fp); fileEntry[i].fileSize = bytesCopied; @@ -345,7 +345,7 @@ int CreateQLPfile(const char* packFile, FileListClass* fileList) { fwrite(fileEntry, sizeof(QLP_FILE), head.numFiles, packp); fclose(packp); - delete fileEntry; + delete[] fileEntry; return(true); @@ -417,7 +417,7 @@ int CreatePCKfile(const char* packFile, FileListClass* fileList) { } fclose(fp); - delete buff; + delete[] buff; toc.file[i].size = bytesTotal; @@ -428,7 +428,7 @@ int CreatePCKfile(const char* packFile, FileListClass* fileList) { memset(padding, 0x00, pad); fwrite(padding, pad, 1, packp); - delete padding; + delete[] padding; } printf("Done.\n"); -- cgit v1.2.3