Merge remote-tracking branch 'irixxxx/master' into master

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies
@@ -14,16 +14,16 @@ jobs:
     - name: configure
       run: DUMP_CONFIG_LOG=1 ./configure
     - name: make
-      run: make -j2
+      run: make -j$(getconf _NPROCESSORS_ONLN)
 
   build-libretro:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: make
-      run: LDFLAGS=-Wl,--no-undefined make -j2 -f Makefile.libretro
+      run: LDFLAGS=-Wl,--no-undefined make -j$(getconf _NPROCESSORS_ONLN) -f Makefile.libretro
 
 
   build-gp2x:
@@ -32,19 +32,19 @@ jobs:
     permissions:
       packages: read
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=gph
-        make -j2 PLATFORM_MP3=0
+        make -j$(getconf _NPROCESSORS_ONLN) PLATFORM_MP3=0
         make -C platform/gp2x rel VER=$ver
         mv PicoDrive_$ver.zip PicoDrive-gph_$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: GP2X
         path: PicoDrive-gph_*.zip
@@ -53,19 +53,19 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-pandora
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=pandora
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         make -C platform/pandora rel VER=$ver
         mv platform/pandora/PicoDrive_*.pnd .
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Pandora
         path: PicoDrive_*.pnd
@@ -77,7 +77,7 @@ jobs:
     - name: build environment
       run: |
         apk add git gcc g++ zip
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
@@ -86,33 +86,57 @@ jobs:
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=psp
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         make -C platform/psp rel VER=$ver
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PSP
         path: PicoDrive_psp_*.zip
 
+  build-ps2:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev
+    steps:
+    - name: build environment
+      run: |
+        apk add build-base cmake git zip make
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: build
+      run: |
+        export CROSS_COMPILE=mips64r5900el-ps2-elf-
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=ps2
+        make -j$(getconf _NPROCESSORS_ONLN)
+        make -C platform/ps2 rel VER=$ver
+    - name: artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: PS2
+        path: PicoDrive_ps2_*.zip
+
 
   build-dingux:
     runs-on: ubuntu-latest
     permissions:
       packages: read
     container: ghcr.io/irixxxx/toolchain-dingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=dingux
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive-dge.zip PicoDrive-dge-$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Dingux
         path: PicoDrive-dge*.zip
@@ -121,18 +145,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-opendingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=opendingux-gcw0
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-gcw0-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: GCW0
         path: PicoDrive-gcw0*.opk
@@ -141,18 +165,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-opendingux
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=opendingux
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-opendingux-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Opendingux
         path: PicoDrive-opendingux*.opk
@@ -163,18 +187,18 @@ jobs:
       packages: read
     container: ghcr.io/irixxxx/toolchain-miyoo
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=miyoo
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive-miyoo.zip PicoDrive-miyoo-$ver.zip
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Miyoo
         path: PicoDrive-miyoo*.zip
@@ -183,18 +207,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-retrofw
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=retrofw
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-retrofw-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: RetroFW
         path: PicoDrive-retrofw*.opk
@@ -203,18 +227,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-gcw0
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-gcw0-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta gcw0
         path: PicoDrive-odbeta-*.opk
@@ -223,18 +247,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-lepus
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-lepus-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta lepus
         path: PicoDrive-odbeta-*.opk
@@ -243,18 +267,18 @@ jobs:
     runs-on: ubuntu-latest
     container: ghcr.io/irixxxx/toolchain-odbeta-rs90
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: build
       run: |
         git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=odbeta
-        make -j2
+        make -j$(getconf _NPROCESSORS_ONLN)
         mv PicoDrive.opk PicoDrive-odbeta-rg99-$ver.opk
     - name: artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODbeta rg99
         path: PicoDrive-odbeta-*.opk

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/irixxxx/libpicofe.git
 [submodule "cpu/cyclone"]
 	path = cpu/cyclone
-	url = https://github.com/notaz/cyclone68000.git
+	url = https://github.com/irixxxx/cyclone68000.git
 [submodule "pico/sound/emu2413"]
 	path = pico/sound/emu2413
 	url = https://github.com/digital-sound-antiques/emu2413.git

Makefile

@@ -71,6 +71,10 @@ CFLAGS += $(call chkCCflag, -fno-caller-saves -fno-guess-branch-probability -fno
 # very old gcc toolchains may not have these options
 CFLAGS += $(call chkCCflag, -fno-tree-loop-if-convert -fipa-pta -fno-ipa-cp)
 endif
+else
+ifneq ($(STATIC_LINKING), 1)
+CFLAGS += $(call chkCCflag, -flto)
+endif
 endif
 
 # revision info from repository if this not a tagged release
@@ -149,10 +153,6 @@ all: $(TARGET).opk
 endif
 endif
 
-ifneq (,$(filter %mips32r2, $(CFLAGS)))
-CFLAGS += -DMIPS_USE_SYNCI # mips32r2 clear_cache uses SYNCI instead of a syscall
-endif
-
 OBJS += platform/opendingux/inputmap.o
 use_inputmap ?= 1
 
@@ -237,21 +237,35 @@ OBJS += platform/psp/asm_utils.o
 OBJS += platform/psp/mp3.o
 USE_FRONTEND = 1
 endif
+ifeq "$(PLATFORM)" "ps2"
+CFLAGS += -DUSE_BGR555 # -DLOG_TO_FILE
+LDLIBS += -lpatches -lgskit -ldmakit -lps2_drivers
+OBJS += platform/ps2/plat.o
+OBJS += platform/ps2/emu.o
+OBJS += platform/ps2/in_ps2.o
+USE_FRONTEND = 1
+endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += platform/libretro/libretro.o
 ifneq ($(STATIC_LINKING), 1)
+CFLAGS += -DHAVE_ZLIB
+OBJS += platform/libretro/libretro-common/formats/png/rpng.o
+OBJS += platform/libretro/libretro-common/streams/trans_stream.o
+OBJS += platform/libretro/libretro-common/streams/trans_stream_pipe.o
+OBJS += platform/libretro/libretro-common/streams/trans_stream_zlib.o
+OBJS += platform/libretro/libretro-common/file/file_path_io.o
+OBJS += platform/libretro/libretro-common/file/file_path.o
+OBJS += platform/libretro/libretro-common/vfs/vfs_implementation.o
+OBJS += platform/libretro/libretro-common/time/rtime.o
+OBJS += platform/libretro/libretro-common/string/stdstring.o
 OBJS += platform/libretro/libretro-common/compat/compat_strcasestr.o
+OBJS += platform/libretro/libretro-common/encodings/encoding_utf.o
+OBJS += platform/libretro/libretro-common/compat/compat_strl.o
 ifeq "$(USE_LIBRETRO_VFS)" "1"
 OBJS += platform/libretro/libretro-common/compat/compat_posix_string.o
-OBJS += platform/libretro/libretro-common/compat/compat_strl.o
 OBJS += platform/libretro/libretro-common/compat/fopen_utf8.o
-OBJS += platform/libretro/libretro-common/encodings/encoding_utf.o
-OBJS += platform/libretro/libretro-common/string/stdstring.o
-OBJS += platform/libretro/libretro-common/time/rtime.o
 OBJS += platform/libretro/libretro-common/streams/file_stream.o
 OBJS += platform/libretro/libretro-common/streams/file_stream_transforms.o
-OBJS += platform/libretro/libretro-common/file/file_path.o
-OBJS += platform/libretro/libretro-common/vfs/vfs_implementation.o
 endif
 endif
 ifeq "$(USE_LIBRETRO_VFS)" "1"
@@ -416,6 +430,10 @@ ifneq (,$(findstring -flto,$(CFLAGS)))
 # to avoid saving and reloading it. However, this collides with the use of LTO.
 pico/32x/memory.o: CFLAGS += -fno-lto
 pico/32x/sh2soc.o: CFLAGS += -fno-lto
+cpu/sh2/compiler.o: CFLAGS += -fno-lto
+endif
+ifneq (,$(filter mips64%, $(ARCH))$(filter %mips32r2, $(CFLAGS)))
+CFLAGS += -DMIPS_USE_SYNCI # mips32r2 clear_cache uses SYNCI instead of a syscall
 endif
 endif