Merge branch 'main' into authoring_quiet

Author: nicolasnoble

.github/workflows/linux-build.yml

@@ -11,6 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/grumpycoders/pcsx-redux-build:latest
+      options: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined
       env:
         TEST_RESULTS: /tmp/test-results
     steps:

src/mips/common/hardware/pcsxhw.h

@@ -39,22 +39,28 @@ static __inline__ void pcsx_initMsan() { *((volatile char* const)0x1f802089) = 0
 static __inline__ void pcsx_resetMsan() { *((volatile char* const)0x1f802089) = 1; }
 static __inline__ void* pcsx_msanAlloc(uint32_t size) {
     register uint32_t a0 asm("a0") = size;
-    return *((void* volatile* const)0x1f80208c);
+    void* ret;
+    __asm__ volatile("lw %0, 0x208c(%1)" : "=r"(ret) : "r"(0x1f800000), "r"(a0));
+    return ret;
 }
 static __inline__ void pcsx_msanFree(void* ptr) { *((void* volatile* const)0x1f80208c) = ptr; }
 static __inline__ void* pcsx_msanRealloc(void* ptr, uint32_t size) {
     register void* a0 asm("a0") = ptr;
     register uint32_t a1 asm("a1") = size;
-    return *((void* volatile* const)0x1f802090);
+    void* ret;
+    __asm__ volatile("lw %0, 0x2090(%1)" : "=r"(ret) : "r"(0x1f800000), "r"(a0), "r"(a1));
+    return ret;
 }
 static __inline__ void pcsx_msanSetChainPtr(void* headerAddr, void* ptrToNext, uint32_t wordCount) {
     register void* a0 asm("a0") = ptrToNext;
     register uint32_t a1 asm("a1") = wordCount;
-    *((void* volatile* const)0x1f802094) = headerAddr;
+    __asm__ volatile("sw %0, 0x2094(%1)" : : "r"(a0), "r"(0x1f800000), "r"(a1));
 }
 static __inline__ void* pcsx_msanGetChainPtr(void* headerAddr) {
     register void* a0 asm("a0") = headerAddr;
-    return *((void* volatile* const)0x1f802094);
+    void* ret;
+    __asm__ volatile("lw %0, 0x2094(%1)" : "=r"(ret) : "r"(0x1f800000), "r"(a0));
+    return ret;
 }
 
 static __inline__ int pcsx_present() { return *((volatile uint32_t* const)0x1f802080) == 0x58534350; }

src/mips/psyqo/examples/pcsxlua/pcsxlua.cpp

@@ -62,8 +62,7 @@ PCSXLuaScene pcsxLuaScene;
 void pcsxRegisterVariable(void* address, const char* name) {
     register void* a0 asm("a0") = address;
     register const char* a1 asm("a1") = name;
-    __asm__ volatile("" : : "r"(a0), "r"(a1));
-    *((volatile uint8_t* const)0x1f802081) = 255;
+    __asm__ volatile("sw %0, 0x2081(%1)" : : "r"(255), "r"(0x1f800000), "r"(a0), "r"(a1));
 }
 
 }  // namespace

tools/build/Dockerfile

@@ -36,17 +36,22 @@ RUN apt install -y xvfb
 RUN apt install -y python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace
 RUN apt install -y glibc-tools lcov
 RUN apt install -y file
+
+# AppImage dependencies
+RUN apt install -y libfuse2t64
+RUN apt install -y fuse
+
 WORKDIR /tmp
-RUN wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage && \
+RUN wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage && \
     chmod +x /tmp/appimagetool-x86_64.AppImage && \
     cd /opt && /tmp/appimagetool-x86_64.AppImage --appimage-extract && \
     mv squashfs-root appimage-tool.AppDir && \
     ln -s /opt/appimage-tool.AppDir/AppRun /usr/bin/appimagetool && \
     rm /tmp/appimagetool-x86_64.AppImage
 WORKDIR /
-RUN pip3 install --break-system-packages appimage-builder pydpkg
-COPY appimage-dpkg.patch /appimage-dpkg.patch
-RUN patch -p 1 < appimage-dpkg.patch
+RUN wget -O appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
+RUN chmod +x appimage-builder-x86_64.AppImage
+RUN mv appimage-builder-x86_64.AppImage /usr/local/bin/appimage-builder
 RUN apt install -y imagemagick-6.q16 gtk-update-icon-cache appstream
 RUN apt install -y squashfs-tools zip zsync