fix/mainargs with "

.github/workflows/main.yml

@@ -14,20 +14,21 @@ on:
 jobs:
   # This workflow contains a single job called "build"
   setup-sdk:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Cache sdk
         id: cache-sdk
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
              cc65/**/*
              orix-sdk/**/*
              md2hlp/**/*
              orix-software/**/*
              oricutron/**/*
-          key: ${{ secrets.CACHE_ID }}-orix-sdk_
+             bpm/**/*
+          key: ${{ secrets.CACHE_ID }}-orix-sdk
 
       - name: Checkout cc65
         if: steps.cache-sdk.outputs.cache-hit != 'true'
@@ -36,6 +37,13 @@ jobs:
           repository: cc65/cc65
           path: cc65
 
+      - name: Checkout bpm
+        #if: steps.cache-sdk.outputs.cache-hit != 'true'
+        uses: actions/checkout@v3
+        with:
+          repository: orix-software/bpm
+          path: bpm
+
       - name: Checkout orix-sdk
         if: steps.cache-sdk.outputs.cache-hit != 'true'
         uses: actions/checkout@v2
@@ -72,7 +80,8 @@ jobs:
       - name: Prepare environment for oricutron
         if: steps.cache-sdk.outputs.cache-hit != 'true'
         run: |
-          sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev
+          sudo apt-get update
+          sudo apt-get install --fix-missing -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev
           git clone https://github.com/pete-gordon/oricutron.git
           cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE}
           echo Timeout oricutron : $secret.TMOUT_ORICUTRON
@@ -94,39 +103,49 @@ jobs:
   build:
     # The type of runner that the job will run on
     needs: setup-sdk
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       version: ${{ steps.job_vars.outputs.VERSION }}
       repo_name: ${{ steps.job_vars.outputs.REPO_NAME }}
+      bpm_found: ${{ steps.bpm_upload.outputs.BPM_FOUND }}
 
     steps:
       - uses: actions/checkout@v2
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+          submodules: recursive
       - name: Set job variables
         id: job_vars
         run: |
           echo "::set-output name=VERSION::$(cat VERSION)"
           echo "::set-output name=REPO_NAME::${GITHUB_REPOSITORY##*/}"
 
       - name: Install sdk
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
              cc65/**/*
              orix-sdk/**/*
              md2hlp/**/*
              orix-software/**/*
              oricutron/**/*
-          key: ${{ secrets.CACHE_ID }}-orix-sdk_
+             bpm/**/*
+          key: ${{ secrets.CACHE_ID }}-orix-sdk
 
       - name: Prepare environment for project
         run: |
-          ls -l && ls -l ../
-          mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../
+          mkdir ~/bin
+          cd bpm && pip install -r requirements.txt && cd ..
+          cp bpm/src/bpm ~/bin
+          chmod 755 ~/bin/bpm && export PATH=$PATH:~/bin
+          mv cc65 ../ && mv orix-software ../ && mv orix-sdk ../ && mv md2hlp ../ && mv bpm ../
 
       - name: Compile project
-        run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make
+        run:  |
+          PATH=$PATH:~/bin
+          bpm --force-update --replace-for-new-project
+          cd src/kernel8 && bpm update && cd ../../
+          CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make
 
       - name: List build directory content
         run: ls -lR build
@@ -135,19 +154,18 @@ jobs:
         run: |
           git clone https://github.com/orix-software/docker-unit-test.git
           cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd ..
-          cp build/usr/share/kernel/kernelsd.rom ${GITHUB_WORKSPACE}/oricutron/roms/kernel.rom
-          cat  tests/unit_test/xopen.sub > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT
-          cat  tests/unit_test/xrm.sub >> ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT
+          CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make build-unit-test
+          CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make prepare-unit-test
           cd ${GITHUB_WORKSPACE}/oricutron
-          timeout --preserve-status 5 ./xvfb.sh || exit 0
+          timeout --preserve-status 10 ./xvfb.sh || exit 0
 
       - name: Check unit-test
         run: |
           ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/
           bash tests/unit_test/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.job_vars.outputs.REPO_NAME }}
           path: |
@@ -159,18 +177,17 @@ jobs:
           mv ../cc65 . && mv ../orix-software . && mv ../orix-sdk . && mv ../md2hlp .
           ls -l
 
-
-
   upload:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         shell: bash
     env:
       hash: ${{ secrets.HASH }}
       version: ${{ needs.build.outputs.version }}
       repo_name: ${{ needs.build.outputs.repo_name }}
+      BPM_FOUND: ${{ needs.build.outputs.bpm_found }}
 
     steps:
       - name: Get branch name
@@ -189,7 +206,7 @@ jobs:
       # On pourrait faire l'extraction directement à la racine si VERSION est dans l'artifact
       - name: Download Artifact
         id: download
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ needs.build.outputs.repo_name }}
           path: artifact

.gitignore

@@ -14,3 +14,4 @@ tmp/
 *.log
 build.inc
 *.bin
+src/kernel8/orixlibs/*

Makefile

@@ -4,23 +4,37 @@ CFLAGS=-ttelestrat
 ASFLAGS=-ttelestrat
 LDFILES=
 
+FILES_KERNEL7="tmp/xminma.o"
+
+
 all : init kernel memmap
-.PHONY : all
+.PHONY : prepare_tmp all
 
-SOURCE=src/kernel.asm
+prepare_tmp:
+	@mkdir -p tmp/
 
+KCH395_LIB_VERSION=2025.1
+SOURCE=src/kernel.asm
 PROGRAM_NAME=kernel
 
+ifeq ($(strip $(GITHUB_WORKSPACE)),)
+    WORKSPACE = $(ORICUTRON_PATH)
+else
+    WORKSPACE = $(GITHUB_WORKSPACE)/oricutron/
+endif
+
 ifeq ($(CC65_HOME),)
-        CC = cl65
-        AS = ca65
-        LD = ld65
-        AR = ar65
+    CL = cl65
+    CC = cc65
+    AS = ca65
+    LD = ld65
+    AR = ar65
 else
-        CC = $(CC65_HOME)/bin/cl65
-        AS = $(CC65_HOME)/bin/ca65
-        LD = $(CC65_HOME)/bin/ld65
-        AR = $(CC65_HOME)/bin/ar65
+    CL = $(CC65_HOME)/bin/cl65
+    CC = $(CC65_HOME)/bin/cc65
+    AS = $(CC65_HOME)/bin/ca65
+    LD = $(CC65_HOME)/bin/ld65
+    AR = $(CC65_HOME)/bin/ar65
 endif
 
 PATH_PACKAGE_ROM=build/usr/share/$(PROGRAM_NAME)/
@@ -35,42 +49,147 @@ init:
 	@mkdir -p build/usr/src/kernel/
 
 kernel: $(SOURCE)
+	@mkdir -p tmp/
+	@cd src/kernel8 && bpm update && cd ..
+
+	#echo "Building xdebug.lib"
+	#@$(AS) --cpu 6502 -tnone src/functions/xdebug.asm -o tmp/xdebug.o
+
 	@echo Rom are built in $(PATH_PACKAGE_ROM)
-	@echo Build kernelsd.rom for Twilighte board
-	@$(AS) --verbose -s -tnone --debug-info -o kernelsd.ld65 -DWITH_SDCARD_FOR_ROOT=1  $(SOURCE) $(ASFLAGS) > output.log
-	@$(LD) -C src/kernel.cfg kernelsd.ld65 -m kernelsd.map -DWITH_SDCARD_FOR_ROOT=1 -DWITH_TWILIGHTE_BOARD=1  -Ln kernelsd.sym > output.log
+	@echo "########################################################"
+	@echo "#  Build kernelsd.rom for Twilighte board              #"
+	@echo "########################################################"
+	@$(AS) --cpu 6502 -tnone src/functions/strings/xminma.asm -o tmp/xminma.o
+	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/switch_to_kernel_extended.s -o tmp/switch_to_kernel_extended.o
+	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_restore_banking_states.s -o tmp/kernel_restore_banking_states.o
+	@$(AS) --cpu 6502 -tnone src/functions/lib_mng/XBANK_ROUTINE.s -o tmp/xbank_routine.o
+	@$(AS) --cpu 6502 -tnone src/functions/network/init_network.s -o tmp/init_network.o
+	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/search_free_bank.s -o tmp/search_free_bank.o
+	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_free_bank.s -o tmp/kernel_free_bank.o
+	@$(AS) --cpu 6502 -tnone src/functions/bank_mng/kernel_free_bank_by_pid.s -o tmp/kernel_free_bank_by_pid.o
+	@$(AS) --cpu 6502 -tnone src/functions/network/close_sockets_by_pid.s -o tmp/close_sockets_by_pid.o
+	@$(AS) --cpu 6502 -tnone src/functions/network/xsocket.s -o tmp/xsocket.o
+	@$(AS) --cpu 6502 -tnone src/functions/network/xconnect.s -o tmp/xconnect.o
+	@$(AS) --cpu 6502 -tnone src/functions/network/xsend.s -o tmp/xsend.o
+	@$(AS) --cpu 6502 -tnone src/functions/xloadcharset.asm -o tmp/xloadcharset.o
+	@$(AS) --cpu 6502 -tnone src/functions/charsets/charset.asm -o tmp/charset.o
+
+	@$(AS) --cpu 6502 -tnone src/functions/network/xclose_socket.s -o tmp/xclose_socket.o
+
+
+
+
+
+	@$(AR) r tmp/kernel.lib tmp/xminma.o
+	@$(AR) r tmp/kernel.lib tmp/switch_to_kernel_extended.o
+	@$(AR) r tmp/kernel.lib tmp/kernel_restore_banking_states.o
+	@$(AR) r tmp/kernel.lib tmp/xbank_routine.o
+# 	@$(AR) r tmp/kernel.lib tmp/charset.o
+# 	@$(AR) r tmp/kernel.lib tmp/xloadcharset.o
+
+
+
+	@$(AR) r tmp/kernel_bank8.lib tmp/init_network.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/search_free_bank.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/kernel_free_bank.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/kernel_free_bank_by_pid.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/xsocket.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/xconnect.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/xsend.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/xclose_socket.o
+	@$(AR) r tmp/kernel_bank8.lib tmp/close_sockets_by_pid.o
+# 	@$(AR) r tmp/kernel_bank8.lib tmp/charset.o
+# 	@$(AR) r tmp/kernel_bank8.lib tmp/xloadcharset.o
+
+	@$(AS) --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 --verbose -s -ttelestrat src/kernel_main_memory.s -o tmp/kernel_main_memory.ld65
+	@$(AS) --verbose -s --debug-info --cpu 6502 src/kernel8/src/kernel8.s -o tmp/kernel_bank8.ld65 $(ASFLAGS) > output.log
+	@$(AS) --verbose -s --debug-info -o tmp/kernel_bank0.ld65 -DWITH_SDCARD_FOR_ROOT=1 src/kernel_bank0.s $(ASFLAGS) > output.log
+	@$(AS) --verbose -s --debug-info -o tmp/kernelsd.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > output.log
+	@$(LD) -C cfg/kernel.cfg -DWITH_SDCARD_FOR_ROOT=1 tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib tmp/charset.o tmp/xloadcharset.o -Ln tmp/kernelsd.sym -m tmp/memmap.txt -vm || exit 1
 	@cp kernel.rom kernelsd.rom
-	@sed -re 's/al 00(.{4}) \.(.+)$$/\1 \2/' kernelsd.sym| sort > kernelsd2.sym > output.log
+
+	@echo Build kernel bank 8
+	@$(AS) --cpu 6502 -DWITH_SDCARD_FOR_ROOT=1 --verbose -s -ttelestrat src/kernel_bank0.s -o tmp/kernel_bank0.ld65 --debug-info > memmap.md
+	@$(LD) -C cfg/rom.cfg tmp/kernel_bank8.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel_bank8.lib src/kernel8/orixlibs/ksocket/usr/share/ksocket/2025.1/ksocket.lib  src/kernel8/orixlibs/kch395/usr/share/kch395/$(KCH395_LIB_VERSION)/kch395.lib src/kernel8/orixlibs/ch395/usr/share/ch395/2024.4/ch395.lib -o kernel8.rom -Ln tmp/kernel8sd.sym -m tmp/memmap8.txt -vm
+	@cp kernel8.rom  $(PATH_PACKAGE_ROM)/
+
+	@#@sed -re 's/al 00(.{4}) \.(.+)$$/\1 \2/' kernelsd.sym| sort > kernelsd2.sym > output.log
 	@cp kernelsd.rom $(PATH_PACKAGE_ROM)/
-	@cp kernelsd.sym  $(PATH_PACKAGE_ROM)/
-	@cp kernelsd.map $(PATH_PACKAGE_ROM)/
+	@#@cp kernelsd.sym $(PATH_PACKAGE_ROM)/
+	@#@cp kernelsd.map $(PATH_PACKAGE_ROM)/
 
-	@echo Build kernelus.rom for Twilighte board
+	@echo "########################################################"
+	@echo "#       Build kernelus.rom for Twilighte board         #"
+	@echo "########################################################"
+	@$(AS) --verbose -s --debug-info -o kernel_bank0.ld65 -DWITH_TWILIGHTE_BOARD=1 src/kernel_bank0.s $(ASFLAGS) > output.log
 	@echo "WITH_TWILIGHTE_BOARD">$(PATH_PACKAGE_ROM)/kernelus.lst
-	@$(AS) --verbose -s -tnone --debug-info -o kernelus.ld65  $(SOURCE) $(ASFLAGS) > output.log
-	@$(LD) -C src/kernel.cfg kernelus.ld65 -m kernelus.map  -DWITH_TWILIGHTE_BOARD=1  -Ln kernelus.sym > output.log
+	@$(AS) --verbose -s --debug-info -o kernelus.ld65 $(SOURCE) $(ASFLAGS) > output.log
+
+compile_cc65:
+	@echo "########################################################"
+	@echo "#       Compile C file with cc65                        #"
+	@echo "########################################################"
+	@echo "FILE_TO_COMPILE: $(FILE_TO_COMPILE) FINAL_BIN: $(FINAL_BIN)"
+	@echo Build $(FILE_TO_COMPILE) to tmp/$(FINAL_BIN)_1000.s
+	@$(CC) $(CFLAGS) $(FILE_TO_COMPILE) -o tmp/$(FINAL_BIN)_1000.s
+	@echo Build $(FILE_TO_COMPILE) to tmp/$(FINAL_BIN)_2304.s
+	@$(CC) $(CFLAGS) $(FILE_TO_COMPILE) -o tmp/$(FINAL_BIN)_2304.s
+
+	@$(AS) $(CFLAGS) tmp/$(FINAL_BIN)_1000.s -o tmp/$(FINAL_BIN)_1000.o
+	@$(AS) $(CFLAGS) tmp/$(FINAL_BIN)_2304.s -o tmp/$(FINAL_BIN)_2304.o
+
+	@$(LD) $(CFLAGS) tmp/$(FINAL_BIN)_1000.o -o tmp/$(FINAL_BIN)_1000 --start-addr 2048 telestrat.lib
+	@$(LD) $(CFLAGS) tmp/$(FINAL_BIN)_2304.o -o tmp/$(FINAL_BIN)_2304 --start-addr 2304 telestrat.lib
+	@chmod +x dependencies/orix-sdk/bin/relocbin.py3
+	@dependencies/orix-sdk/bin/relocbin.py3 -o tmp/$(FINAL_BIN) -2 tmp/$(FINAL_BIN)_1000 tmp/$(FINAL_BIN)_2304
+
+prepare-unit-test:
+	@cp build/usr/share/kernel/kernelsd.rom ${WORKSPACE}/roms/kernel.rom
+	@cat tests/unit_test/xopen.sub > ${WORKSPACE}/sdcard/ETC/AUTOBOOT
+	@cat tests/file_operations/file_operations.sub >> ${WORKSPACE}/sdcard/ETC/AUTOBOOT
+	@cat tests/unit_test/xrm.sub >> ${WORKSPACE}/sdcard/ETC/AUTOBOOT
+	@cat tests/unit_test/tail.sub >> ${WORKSPACE}/sdcard/ETC/AUTOBOOT
+	@cp tmp/tfseek ${WORKSPACE}/sdcard/BIN
+	cat ${WORKSPACE}/sdcard/ETC/AUTOBOOT
+
+launch-unit-test: build-unit-test prepare-unit-test execute-oricutron
+	@echo "########################################################"
+	@echo "#       Launch unit test                              #"
+	@echo "########################################################"
+
+execute-oricutron:
+	@cp kernelsd.rom ${WORKSPACE}/roms/kernel.rom
+	@cp kernel8.rom ${WORKSPACE}/roms/
+	@cd ${WORKSPACE} && ./oricutron
+
+memmap:
 	@cp kernel.rom kernelus.rom
 	@cp kernelus.rom $(PATH_PACKAGE_ROM)/
 
-unittest:
-	$(CC) $(CFLAGS) tests/mkdir.c -o tmkdir
-	$(CC) $(CFLAGS) tests/fwrite.c -o tfwrite
+build-unit-test:
+	@$(MAKE) compile_cc65 FILE_TO_COMPILE="tests/file_operations/fseek_test.c" FINAL_BIN="tfseek"
+	@#$(CL) $(CFLAGS) tests/file_operations/mkdir.c -o tmp/tmkdir
+	@$(CL) $(CFLAGS) tests/file_operations/fwrite.c -o tmp/tfwrite
+	@$(CL) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o tmp/1000 --start-addr 2048
+	@$(CL) $(CFLAGS) tests/unit_test/mainarg.s -I dependencies/orix-sdk/macros/ -o tmp/1256 --start-addr 2304
 
-memmap:
-	@$(AS) --verbose -s -tnone --debug-info -o kernel-telestrat.ld65 -DWITH_SDCARD_FOR_ROOT=1 $(SOURCE) $(ASFLAGS) > memmap.md
-	@$(LD) -C src/kernel.cfg kernel-telestrat.ld65 -m kernel.map -o kernel-telestrat.ld65.rom -DWITH_ACIA=2 -DWITH_SDCARD_FOR_ROOT=1 -Ln kernel-telestrat.ca.sym
-	sh generate_memmap.sh
+	@echo "########################################################"
+	@echo "#       Build memmap.md                                #"
+	@echo "########################################################"
+	@$(AS) --cpu 6502 -DMEMMAP_GENERATE=1 --verbose -s -ttelestrat src/kernel_main_memory.s -o tmp/kernel_main_memory.ld65 > memmap.md
+	@#@$(LD) -C cfg/kernel.cfg tmp/kernelsd.ld65 tmp/kernel_bank0.ld65 tmp/kernel_main_memory.ld65 tmp/kernel.lib -m kernelus.map -o kernel-telestrat.ld65.rom -DWITH_ACIA=2 -DWITH_SDCARD_FOR_ROOT=1 -Ln kernel-telestrat.ca.sym
+	@sh generate_memmap.sh
 
 test:
-	cp Makefile build/usr/src/kernel/
-	cp README.md build/usr/src/kernel/
-	cp src/* build/usr/src/kernel/ -adpR
-	cp README.md build/usr/share/doc/$(PROGRAM_NAME)/
-	ls -l $(HOMEDIR)
-	export ORIX_PATH=`pwd`
-	sh tools/builddocs.sh
-	cd build && tar -c * > ../$(PROGRAM_NAME).tar &&	cd ..
-	filepack  $(PROGRAM_NAME).tar $(PROGRAM_NAME).pkg
-	gzip $(PROGRAM_NAME).tar
-	mv $(PROGRAM_NAME).tar.gz $(PROGRAM_NAME).tgz
+	@cp Makefile build/usr/src/kernel/
+	@cp README.md build/usr/src/kernel/
+	@cp src/* build/usr/src/kernel/ -adpR
+	@cp README.md build/usr/share/doc/$(PROGRAM_NAME)/
+	@ls -l $(HOMEDIR)
+	@export ORIX_PATH=`pwd`
+	@sh tools/builddocs.sh
+	@cd build && tar -c * > ../$(PROGRAM_NAME).tar && cd ..
+	@filepack  $(PROGRAM_NAME).tar $(PROGRAM_NAME).pkg
+	@gzip $(PROGRAM_NAME).tar
+	@mv $(PROGRAM_NAME).tar.gz $(PROGRAM_NAME).tgz