Merge branch 'main' into splash

Author: nicolasnoble

.github/scripts/create-app.sh

@@ -40,6 +40,9 @@ cp pcsx-redux.icns ${APPROOT}/Contents/Resources/AppIcon.icns
 # Remove source images that were used to create the app icon.
 rm -rfv ${APPROOT}/Contents/Resources/share/icons
 
+# Remove temporary image files
+rm -rfv pcsx-redux.iconset pcsx-redux.icns
+
 # Create the required Info.plist and version.plist files
 # with the minimum information.
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleDisplayName string ${APP}"
@@ -54,6 +57,8 @@ PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleInfoDictionaryVersion
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundleName string ${APP}"
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add CFBundlePackageType string APPL"
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add NSHumanReadableCopyright string Copyright PCSX-Redux Authors"
+PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSApplicationCategoryType string public.app-category.games"
+PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSSupportsGameMode bool true"
 
 PlistBuddy ${APPROOT}/Contents/Info.plist -c "add LSMinimumSystemVersion string 10.15"
 

.github/workflows/linux-aur.yml

@@ -13,15 +13,21 @@ jobs:
       image: archlinux:latest
     steps:
       - name: Install dependencies
-        run: | 
+        run: |
           pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+      - uses: actions/checkout@v3
+        with:
+          set-safe-directory: true
       - name: Create builduser
         run: |
           useradd builduser -m
           passwd -d builduser
+          echo "builduser ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/builduser && chmod 440 /etc/sudoers.d/builduser
       - name: Build AUR Package
         run: |
-          git clone https://aur.archlinux.org/pcsx-redux-git.git
-          chown -R builduser:builduser pcsx-redux-git
-          cd pcsx-redux-git
-          sudo -u builduser makepkg
+          mkdir /build
+          git clone https://aur.archlinux.org/pcsx-redux-git.git /build/pcsx-redux-git
+          chown -R builduser:builduser /build
+          cd /build/pcsx-redux-git
+          sed -i s,git+https://github.com/grumpycoders/pcsx-redux.git,git+file://$GITHUB_WORKSPACE#commit=$GITHUB_SHA,g PKGBUILD
+          sudo -u builduser bash -c 'makepkg --noconfirm --syncdeps'

.github/workflows/macos-toolchain.yml

@@ -19,9 +19,11 @@ jobs:
     - uses: n1hility/cancel-previous-runs@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
+    - name: install dependencies
+      run: brew install --verbose nikitabobko/tap/brew-install-path
     - name: build mips binutils
-      run: brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-binutils.rb
     - name: build mips gcc
-      run: brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb --debug
+      run: brew install-path --verbose ./tools/macos-mips/mipsel-none-elf-gcc.rb
     - name: build openbios
       run: make -C ./src/mips/openbios

.gitignore

@@ -58,7 +58,7 @@ fb.bat
 
 # macos files
 .DS_store
-
+PCSX-Redux.app
 
 # Savestate files
 *.sstate

README.md

@@ -130,8 +130,9 @@ You need MacOS Catalina or later with the latest XCode to build, as well as a fe
 
 Compiling OpenBIOS will require a mips compiler, that you can generate using the following commands:
 ```bash
-brew install ./tools/macos-mips/mipsel-none-elf-binutils.rb
-brew install ./tools/macos-mips/mipsel-none-elf-gcc.rb
+brew install nikitabobko/tap/brew-install-path
+brew install-path ./tools/macos-mips/mipsel-none-elf-binutils.rb
+brew install-path ./tools/macos-mips/mipsel-none-elf-gcc.rb
 ```
 
 Then, you can compile OpenBIOS using `make -C ./src/mips/openbios`.

src/core/DynaRec_aa64/emitter.h

@@ -71,6 +71,8 @@ class Emitter : public MacroAssembler {
         return VirtualProtect(s_codeCache, allocSize, PAGE_EXECUTE_READWRITE, &oldProtect) != 0;
 #elif !defined(__APPLE__)
         return mprotect(s_codeCache, allocSize, PROT_READ | PROT_WRITE | PROT_EXEC) != -1;
+#else
+        return false;
 #endif
     }
 

src/core/DynaRec_aa64/recompiler.cc

@@ -67,8 +67,7 @@ bool DynaRecCPU::Init() {
         PCSX::g_system->message("[Dynarec] Failed to allocate executable memory.\nTry disabling the Dynarec CPU.");
         return false;
     }
-#endif
-#if defined(__APPLE__)
+#else
     gen.setRW();  // M1 wants buffer marked as readable/writable with mprotect before emitting code
 #endif
     emitDispatcher();  // Emit our assembly dispatcher
@@ -102,8 +101,6 @@ void DynaRecCPU::Shutdown() {
     delete[] m_ramBlocks;
     delete[] m_biosBlocks;
     delete[] m_dummyBlocks;
-
-    gen.dumpBuffer();  // dump buffer on shutdown/hard-reset for diagnostics
 }
 
 /// Params: A program counter value

src/core/DynaRec_aa64/recompiler.h

@@ -237,6 +237,12 @@ class DynaRecCPU final : public PCSX::R3000Acpu {
     virtual void Shutdown() final;
     virtual bool isDynarec() final { return true; }
 
+    virtual void invalidateCache() override final {
+        memset(m_regs.iCacheAddr, 0xff, sizeof(m_regs.iCacheAddr));
+        memset(m_regs.iCacheCode, 0xff, sizeof(m_regs.iCacheCode));
+        uncompileAll();  // Mark all blocks as uncompiled
+    }
+
     virtual void SetPGXPMode(uint32_t pgxpMode) final {
         if (pgxpMode != 0) {
             throw std::runtime_error("PGXP not supported in x64 JIT");

src/core/arguments.cc

@@ -35,6 +35,7 @@ PCSX::Arguments::Arguments(const CommandLine::args& args) {
     if (std::filesystem::exists("pcsx.json")) m_portable = true;
     if (std::filesystem::exists(std::filesystem::path("vsprojects") / "pcsx-redux.sln")) m_portable = true;
     if (std::filesystem::exists(std::filesystem::path("..") / "pcsx-redux.sln")) m_portable = true;
+    if (args.get<bool>("no-portable")) m_portable = false;
     if (args.get<bool>("safe") || args.get<bool>("testmode") || args.get<bool>("cli")) m_safeModeEnabled = true;
     if (args.get<bool>("resetui")) m_uiResetRequested = true;
     if (args.get<bool>("noshaders")) m_shadersDisabled = true;

src/mips/openbios/card/device.c

@@ -632,9 +632,9 @@ static const struct Device s_cardDevice = {
     .desc = "MEMORY CARD",
     .init = (void (*)())psxdummy,
     .open = dev_bu_open,
-    .action = psxdummy,
+    .action = (int (*)(struct File *, enum FileAction))psxdummy,
     .close = dev_bu_close,
-    .ioctl = psxdummy,
+    .ioctl = (int (*)(struct File *, int,  int))psxdummy,
     .read = dev_bu_read,
     .write = dev_bu_write,
     .erase = dev_bu_erase,