Merge pull request #4 from pce-devel/master

HuCC beta and the latest PCEAS updates.
pce-devel · Oct 28, 2024 · c6a852e · c6a852e
2 parents 07e97ed + ed32900
commit c6a852e
Show file tree

Hide file tree

Showing 308 changed files with 71,706 additions and 7,395 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,6 +4,11 @@ name: build
 # upvote here https://github.com/github/feedback/discussions/4501
 #
 # See https://github.com/marketplace/actions/setup-xcode-version
+#
+# Just for reference ...
+#
+# sudo xcode-select -s "/Applications/Xcode_13.4.1.app"
+
 on: 
   push:
   pull_request:
@@ -20,11 +25,11 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out code from the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Build on Linux
@@ -38,14 +43,18 @@ jobs:
           ${{ env.MSYS2_INSTALL_FOLDER }}\msys2_shell.cmd -mingw64 -no-start -defterm -c "pacman -S binutils make mingw-w64-x86_64-gcc git --noconfirm"
           ${{ env.MSYS2_INSTALL_FOLDER }}\msys2_shell.cmd -mingw64 -no-start -defterm -where %CD% -c "make"
           echo Build Complete
-      - name: Build on Mac
-        if: startsWith(matrix.os, 'macos')
+      - name: Build on MacOs-13
+        if: startsWith(matrix.os, 'macos-13')
+        run: |
+          make
+          echo Build Complete
+      - name: Build on MacOs-14
+        if: startsWith(matrix.os, 'macos-14')
         run: |
-          sudo xcode-select -s "/Applications/Xcode_13.2.1.app"
           make
           echo Build Complete
       - name: Archive toolchain
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: toolchain-${{ matrix.os }}
           path: |
@@ -58,14 +67,14 @@ jobs:
   test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-11, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-13, macos-14, windows-2022]
     runs-on: ${{ matrix.os }}
     needs: build
     steps:
       - name: Check out code from the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get previoulsy built artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: toolchain-${{ matrix.os }}
       - name: Restore Execute Flags
@@ -103,14 +112,14 @@ jobs:
   package:
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12, windows-2022]
+        os: [ubuntu-22.04, macos-13, windows-2022]
     runs-on: ${{ matrix.os }}
     needs: build
     steps:
       - name: Check out code from the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get previously built artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: toolchain-${{ matrix.os }}
       - name: Package ${{ matrix.os }}
@@ -130,7 +139,7 @@ jobs:
           make package
           echo Package Complete
       - name: Archive package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: package-${{ matrix.os }}
           path: |
@@ -143,27 +152,36 @@ jobs:
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
     steps:
       - name: Check out code from the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get previoulsy built artifacts win64
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: package-windows-2022
       - name: Get previously built artifacts macos
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: package-macos-12
+          name: package-macos-13
       - name: Get previously built artifacts linux
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: package-ubuntu-20.04
+          name: package-ubuntu-22.04
         # https://github.com/pyTooling/Actions/tree/main/releaser
         # need to use composite on windows, since docker isn't available
-      - name: publish package
+      - name: publish release package
+        if: ${{ github.event_name == 'release' }}
         uses: pyTooling/Actions/releaser@r0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag: ${{ github.ref_name }}
           rm: true # do not keep old latest artifacts
           files: |
             *.zip
-
+      - name: publish current package
+        if: ${{ github.event_name != 'release' }}
+        uses: pyTooling/Actions/releaser@r0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: "current"
+          rm: true # do not keep old latest artifacts
+          files: |
+            *.zip
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         # debug: true
         languages: ${{ matrix.language }}
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,4 +71,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.gitignore b/.gitignore
@@ -1,34 +1,22 @@
 .DS_Store
 *.iso
-*.ovl
+*.lst
 *.o
+*.out
+*.ovl
 *.pce
+*.s
 *.sgx
 *.sym
-*.s
-/huc/
-/huc/tgemu/tgemu*
-/huc/src/huc/huc
-/huc/src/huc/huc.exe
-/huc/src/isolink/huc.exe
-/huc/src/mkit/as/pceas.exe
-/huc/src/mkit/as/fujias.exe
-/huc/src/mkit/as/nesasm.exe
-/huc/src/tools/mml/mml.exe
-/huc/src/tools/mod2mml/mod2mml.exe
-/huc/src/tools/pcxtool/pcxtool.exe
-*.lst
-
+*.user
+.vs
+.x86
+.x64
 bin
-examples/acd/ac_test.iso
-examples/sgx/sgx_test.iso
-examples/sgx/sgx_test.sgx
-examples/shmup/bgm.asm
-examples/shmup/mod2mml.log
-examples/shmup/shmup.iso
-
 src/huc/huc
 src/huc/huc.exe
+src/hucc/hucc
+src/hucc/hucc.exe
 src/isolink/isolink
 src/isolink/isolink.exe
 src/mkit/as/fujias
@@ -38,19 +26,20 @@ src/mkit/as/nesasm.exe
 src/mkit/as/pceas
 src/mkit/as/pceas.exe
 src/mkit/as/pngread/pngread.a
+src/tools/hulz/hulz
+src/tools/hulz/hulz.exe
 src/tools/mml/mml
 src/tools/mml/mml.exe
 src/tools/mod2mml/mod2mml
 src/tools/mod2mml/mod2mml.exe
+src/tools/pce2png/pce2png
+src/tools/pce2png/pce2png.exe
+src/tools/pce2png/pngwrite/pngwrite.a
+src/tools/pce2png/pngwrite/pngwrite.lib
 src/tools/pcxtool/pcxtool
 src/tools/pcxtool/pcxtool.exe
 src/tools/sym2inc/sym2inc
 src/tools/sym2inc/sym2inc.exe
 src/tools/wav2vox/wav2vox
 src/tools/wav2vox/wav2vox.exe
-src/tools/pce2png/pce2png
-src/tools/pce2png/pce2png.exe
-src/tools/pce2png/pngwrite/pngwrite.a
-src/tools/pce2png/pngwrite/pngwrite.lib
 tgemu/tgemu*
-src/version.h
diff --git a/Makefile b/Makefile
@@ -24,6 +24,7 @@ install:
 
 test:
 	@cd test ; /bin/sh ./test_compiler.sh
+	@cd test ; /bin/sh ./test_hucc.sh
 
 check:
 	@cd test ; /bin/sh ./test_examples.sh