Merge branch 'header-fixes'

Author: gerph

.github/workflows/ci.yml

@@ -34,6 +34,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v4
 
+      - name: Install prerequisites
+        run: |
+          pip3 install -r requirements.txt
+
       - name: Build the library
         run: |
           make

create_hfiles.sh

@@ -4,13 +4,19 @@
 
 set -e
 
-for i in oslib/include/*.h ; do
+for i in oslib/include/*.h oslib/Macros/header oslib/Types/header ; do
+    name=$(basename "$i")
+    if [[ "$i" == 'oslib/Macros/header' ]] ; then
+        name="macros.h"
+    elif [[ "$i" == 'oslib/Types/header' ]] ; then
+        name="types.h"
+    fi
     env LC_ALL=C sed -E -e '/__swi[^;]*$/,/;/ s/^/\/\//' \
                         -e '/__swi.*;$/ s/^/\/\//' \
                         -e 's/([ (])int /\1int32_t /' \
                         -e 's/unsigned int32_t/uint32_t/' \
                         -e 's/typedef int32_t *bool;/#include <stdbool.h>/' \
                         -e '3i #include <stdint.h>' \
                         < "$i" \
-                        > "include/$(basename "$i")"
+                        > "include/$name"
 done

create_sfiles.sh

@@ -6,10 +6,10 @@ set -e
 
 for n in oslib/*/def/* ; do
     nb=$(basename "$n")
-    # Exclude non-working files
-    if [[ "$nb" = 'joystick' ]] ; then
-        continue
-    fi
+    # Exclude non-working files (everything seems to be working now!)
+    #if [[ "$nb" = 'nothing' ]] ; then
+    #    continue
+    #fi
     python oslib_parser.py --oslib-dir oslib/ \
                            "$n" \
                            --create-aarch64-api "src/$nb.s"

oslib/Computer/def/joystick

@@ -27,7 +27,7 @@ CONST
    Joystick_HalfWordYShift        = .Int: 16;
 SWI Joystick_ReadHalfWord =
    (  NUMBER 0x43F40 "Returns the state of a joystick",
-      ENTRY (R0 | .Int: joystick_no, R0 # %100000000),
+      ENTRY (R0 # %100000000, R0 | .Int: joystick_no),
       EXIT  (R0! = Joystick_HalfWordState: state, R1 = .Bits: switches)
    );