Merge pull request #54 from fjtrujy/fix_ps2sdk

Reduce `ps2link` size and improve code.

Author: rickgaiser

.github/workflows/compilation.yml

@@ -24,10 +24,11 @@ jobs:
         run: |
           apk add build-base git
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Compile project
         run: |
-          make clean all LOADHIGH=${{ matrix.version[1] }}
+          make -j $(getconf _NPROCESSORS_ONLN) clean 
+          make -j $(getconf _NPROCESSORS_ONLN) LOADHIGH=${{ matrix.version[1] }}
 
       - name: Get short SHA
         id: slug
@@ -47,13 +48,13 @@ jobs:
           tar -zcvf ps2link-${{ steps.slug.outputs.sha8 }}-${{ matrix.version[0] }}.tar.gz ps2link
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ps2link-${{ steps.slug.outputs.sha8 }}-${{ matrix.version[0] }}
           path: ps2link-${{ steps.slug.outputs.sha8 }}-${{ matrix.version[0] }}.tar.gz
 
       - name: Upload uncompressd artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ps2link-uncompressed-${{ steps.slug.outputs.sha8 }}-${{ matrix.version[0] }}
           path: ee/ps2link.elf
@@ -64,7 +65,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/master'
     steps:
       - name: Download all artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ps2link
 

.gitignore

@@ -34,3 +34,4 @@
 #
 # Generated source files
 #
+*_irx.c

Makefile

@@ -13,10 +13,6 @@ ZEROCOPY = 0
 # otherwise it will try and reset ps2link
 PWOFFONRESET = 1
 
-# Set to the path where ps2eth is located
-PS2ETH = $(PS2DEV)/ps2eth
-
-BIN2C=bin2c
 RM=rm -f
 
 #
@@ -29,41 +25,13 @@ EE_BIN = ee/ps2link.elf
 
 all: $(EE_BIN_PKD)
 
-IRXFILES=\
-	ps2link.irx \
-	ioptrap.irx \
-	ps2dev9.irx \
-	poweroff.irx \
-	ps2ip.irx \
-	netman.irx \
-	smap.irx \
-	udptty.irx
-
-EE_IRX_OBJS = $(addprefix ee/, $(addsuffix _irx.o, $(basename $(IRXFILES))))
-EE_IRX_OBJS += ps2ip_nm_irx.o
-# Where to find the IRX files
-vpath %.irx $(PS2SDK)/iop/irx/
-vpath %.irx iop/
-
-# Rule to generate them
-ee/%_irx.o: %.irx
-	$(BIN2C) $< $*_irx.c $*_irx
-	$(EE_CC) -c $*_irx.c -o ee/$*_irx.o
-	rm $*_irx.c
-
-# The 'minus' sign is not handled well...
-ps2ip_nm_irx.o: ps2ip-nm.irx
-	$(BIN2C) $< $*.c $*
-	$(EE_CC) -c $*.c -o ee/$*.o
-	rm $*.c
-
 $(EE_BIN): ee
 $(EE_BIN_PKD): $(EE_BIN)
 	ps2-packer $< $@ > /dev/null
 
 export DEBUG LOADHIGH ZEROCOPY PWOFFONRESET
 
-ee: iop builtins
+ee: iop
 	$(MAKE) -C ee
 
 iop:
@@ -72,11 +40,9 @@ iop:
 clean:
 	$(MAKE) -C ee clean
 	$(MAKE) -C iop clean
-	@rm -f ee/*_irx.o bin/*.ELF bin/*.IRX
+	@rm -f ee/*_irx.o ee/*_irx.c bin/*.ELF bin/*.IRX
 
 docs:
 	doxygen doxy.conf
 
-builtins: $(EE_IRX_OBJS)
-
 .PHONY: iop ee

ee/Makefile

@@ -5,35 +5,60 @@ EE_INCS += -I../include
 # This is for the sbv patch
 EE_LIBS += -lpatches -ldebug
 
-# This is to builtin the IRXs into ps2link
-EE_OBJS += ps2link_irx.o ps2ip_nm_irx.o netman_irx.o smap_irx.o ioptrap_irx.o ps2dev9_irx.o poweroff_irx.o udptty_irx.o
+# IRX libs
+IRX_FILES += ioptrap.irx ps2dev9.irx poweroff.irx
+IRX_FILES += ps2ip.irx netman.irx smap.irx udptty.irx
+IRX_FILES += ps2link.irx
+EE_OBJS += $(IRX_FILES:.irx=_irx.o) ps2ip_nm_irx.o
+
+# Compile with -Werror
+EE_CFLAGS += -Werror
 
 # This is to enable the debug mode into ps2link
 ifeq ($(DEBUG),1)
 EE_CFLAGS += -DDEBUG -g
+else
+EE_CFLAGS += -Os
+EE_CFLAGS += -fdata-sections -ffunction-sections
 endif
 
+ifeq ($(DEBUG),1)
+EE_LDFLAGS += -g
+else
+EE_LDFLAGS += -s
+EE_LDFLAGS += -Wl,--gc-sections
+endif
+EE_LDFLAGS += -Wl,-Map,ps2link.map
+
 # This is to read the closest tag version
 APP_VERSION := $(shell git describe --tags --abbrev=0)
 EE_CFLAGS += -DAPP_VERSION=\"$(APP_VERSION)\"
 
+# Use NEWLIB NANO for making smaller binaries
+NEWLIB_NANO = 1
+
 # Use custom linkfile
 ifeq ($(LOADHIGH),1)
 EE_LINKFILE = linkfile.loadhigh
 else
 EE_LINKFILE = linkfile
 endif
 
-ifeq ($(DEBUG),1)
-EE_LDFLAGS += -g
-else
-EE_LDFLAGS += -s
-endif
-
 all: $(EE_BIN)
 
 clean:
 	-rm -f $(EE_OBJS) $(EE_BIN)
 
+# IRX files
+# Special rule for ps2ip-nm.irx becasue - aren't valid
+ps2ip_nm_irx.c:
+	$(PS2SDK)/bin/bin2c $(PS2SDK)/iop/irx/ps2ip-nm.irx $@ ps2ip_nm_irx
+# Special rule for local ps2link.irx
+ps2link_irx.c:
+	$(PS2SDK)/bin/bin2c ../iop/ps2link.irx $@ ps2link_irx
+%_irx.c:
+	$(PS2SDK)/bin/bin2c $(PS2SDK)/iop/irx/$*.irx $@ $*_irx
+
+
 include $(PS2SDK)/Defs.make
 include $(PS2SDK)/samples/Makefile.eeglobal_cpp