add native arm support

.github/workflows/release.yml

@@ -10,8 +10,8 @@ on:
       - '*' # Any tag
 
 jobs:
-  build-linux:
-    runs-on: ubuntu-latest
+  build-linux-x86_64:
+    runs-on: ubuntu-latest # build both architectures
     steps:
       - uses: actions/checkout@v3
         with:
@@ -40,7 +40,7 @@ jobs:
         run: |
           TAG=${GITHUB_REF##refs/tags/}
           OS=$(uname -s | tr '[:upper:]' '[:lower:]')
-          ARCH=$(uname -m)
+          ARCH=${{ matrix.arch }}
           FOLDER="chloride-$TAG-$OS-$ARCH"
           TAR="$FOLDER.tar.gz"
           mv build/bin "$FOLDER"
@@ -51,18 +51,17 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: linux-artifact
+          name: linux-x86_64-artifact
           path: ${{ env.TAR_NAME }}
-
-  build-macos:
-    runs-on: macos-latest
+  build-linux-arm64:
+    runs-on: ubuntu-latest-arm # build both architectures
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - name: Install build tools
-        run: brew install flex bison
+        run: sudo apt-get update && sudo apt-get install -y flex bison
 
       - name: Setup Python
         uses: actions/setup-python@v4
@@ -84,6 +83,126 @@ jobs:
         run: |
           TAG=${GITHUB_REF##refs/tags/}
           OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+          ARCH=${{ matrix.arch }}
+          FOLDER="chloride-$TAG-$OS-$ARCH"
+          TAR="$FOLDER.tar.gz"
+          mv build/bin "$FOLDER"
+          cp LICENSE.txt "$FOLDER"
+          tar -czf "$TAR" "$FOLDER"
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux-arm64-artifact
+          path: ${{ env.TAR_NAME }}
+
+  build-macos:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        arch: [x86_64, arm64]   # build both architectures
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - name: Install build tools
+        run: brew install flex bison
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install Conan
+        run: |
+          python -m pip install --upgrade pip
+          pip install conan
+          if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
+            arch -x86_64 conan profile detect
+          else
+            conan profile detect
+          fi
+
+      - name: Build
+        run: |
+          BUILD_DIR="build_${{ matrix.arch }}"
+          mkdir -p "$BUILD_DIR"
+          cd "$BUILD_DIR"
+
+          # Use Rosetta for x86_64 builds on Apple Silicon
+          if [ "${{ matrix.arch }}" = "x86_64" ] && [ "$(uname -m)" = "arm64" ]; then
+            arch -x86_64 bash -c "
+              export CMAKE_OSX_ARCHITECTURES=x86_64
+              conan install .. --build=missing
+              conan build ..
+            "
+          else
+            export CMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}"
+            conan install .. --build=missing
+            conan build ..
+          fi
+
+          cd ..
+
+      - name: Package
+        run: |
+          TAG=${GITHUB_REF##refs/tags/}
+          OS="macos"
+          ARCH="${{ matrix.arch }}"
+          FOLDER="chloride-$TAG-$OS-$ARCH"
+          TAR="$FOLDER.tar.gz"
+          mv build/bin "$FOLDER"
+          cp LICENSE.txt "$FOLDER"
+          tar -czf "$TAR" "$FOLDER"
+          echo "TAR_NAME=$TAR" >> $GITHUB_ENV
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ matrix.arch }}-artifact
+          path: ${{ env.TAR_NAME }}
+
+  build-windows:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+          install: >
+            base-devel
+            mingw-w64-x86_64-gcc
+            mingw-w64-x86_64-make
+            mingw-w64-x86_64-cmake
+            mingw-w64-x86_64-python
+            mingw-w64-x86_64-python-pip
+            msys/flex
+
+      - name: Install Conan
+        run: |
+          python -m pip install --upgrade pip
+          pip install conan
+          conan profile detect
+
+      - name: Build Project
+        run: |
+          conan install . --profile windows-profile.txt --build=missing
+          conan build . --profile windows-profile.txt
+
+      - name: Package
+        run: |
+          TAG=${GITHUB_REF##refs/tags/}
+          OS="windows"
           ARCH=$(uname -m)
           FOLDER="chloride-$TAG-$OS-$ARCH"
           TAR="$FOLDER.tar.gz"
@@ -92,53 +211,6 @@ jobs:
           tar -czf "$TAR" "$FOLDER"
           echo "TAR_NAME=$TAR" >> $GITHUB_ENV
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: macos-artifact
-          path: ${{ env.TAR_NAME }}
-
-  build-windows:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install MinGW-w64 for cross-compilation
-        run: sudo apt-get update && sudo apt-get install -y mingw-w64
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
-      - name: Install Conan
-        run: |
-          python -m pip install --upgrade pip
-          pip install conan
-          conan profile detect
-          conan profile update settings.compiler.version=13 default
-          conan profile update settings.compiler=gcc default
-          conan profile update settings.os=Windows default
-          conan profile update env.CC=x86_64-w64-mingw32-gcc default
-          conan profile update env.CXX=x86_64-w64-mingw32-g++ default
-
-      - name: Build Windows with MinGW
-        run: |
-          conan install . --profile:host=mingw-windows --profile:build=default --build=missing
-          conan build .
-
-      - name: Package Windows build
-        run: |
-          TAG=${GITHUB_REF##refs/tags/}
-          FOLDER="chloride-$TAG-windows-x64"
-          ZIP="$FOLDER.zip"
-          mv build/bin "$FOLDER"
-          cp LICENSE.txt "$FOLDER"
-          zip -r "$ZIP" "$FOLDER"
-          echo "TAR_NAME=$ZIP" >> $GITHUB_ENV
-
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
@@ -147,12 +219,13 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [build-linux, build-macos, build-windows]
+    needs: [build-linux-x86_64, build-linux-arm64, build-macos, build-windows]
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
           path: ./artifacts
+          merge-multiple: true
 
       - name: Create GitHub Release
         uses: ncipollo/release-action@v1

CMakeLists.txt

@@ -52,14 +52,12 @@ find_package(BDWgc REQUIRED)
 find_package(gmp REQUIRED)
 
 target_compile_options(argon PRIVATE -O3 -Wall -Wextra -Wno-unused-function -s)
-if(NOT APPLE)
-    target_link_options(argon PRIVATE -static)
-endif()
 
 target_link_libraries(argon PRIVATE
     BDWgc::BDWgc
     gmp::gmp
     m
+    $<$<PLATFORM_ID:Windows>:bcrypt>
 )
 
 target_include_directories(argon PRIVATE

Makefile

@@ -2,26 +2,31 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+# Default FLEX tool
+BINARY = bin/argon
+FLEX_TOOL = flex
+
+CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
+
 LEXER_SRC = src/lexer/lex.l
 LEXER_C = src/lexer/lex.yy.c
 LEXER_H = src/lexer/lex.yy.h
-
-CFILES = external/xxhash/xxhash.c external/cwalk/src/cwalk.c external/libdye/src/dye.c $(shell find src -name '*.c')
 CFLAGS = $(ARCHFLAGS) -lm -lgc -lgmp -Wall -Wextra -Wno-unused-function -Werror=unused-result -Iexternal/cwalk/include -Iexternal/libdye/include
-BINARY = bin/argon
+LDFLAGS = -lgc -lgmp -lm
 
 all: $(BINARY)
 
+
 $(LEXER_C) $(LEXER_H): $(LEXER_SRC)
-	flex --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
+	$(FLEX_TOOL) --header-file=$(LEXER_H) -o $(LEXER_C) $(LEXER_SRC)
 
 $(BINARY): $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) -s
+	gcc -O3 -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS} -s
 
 native: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -march=native -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
@@ -29,13 +34,13 @@ debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 
 full-debug: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -g -O0 -fsanitize=address -fno-omit-frame-pointer -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 
 optimised: $(CFILES) $(LEXER_C) $(LEXER_H)
 	mkdir -p bin
-	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-generate -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	${BINARY} rand_test.ar
-	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS)
+	gcc -O3 -fprofile-use -o $(BINARY) $(CFILES) $(CFLAGS) ${LDFLAGS}
 	
 
 clean:

conanfile.py

@@ -33,14 +33,9 @@ class ArgonConan(ConanFile):
         os.environ["CONAN_NON_INTERACTIVE"] = "1"
         tc = CMakeToolchain(self)
 
-        if os.name == "nt":  # Windows
-            flex_path = which("win_flex") or which("win_flex.exe")
-            if not flex_path:
-                raise Exception("win_flex not found in PATH. Install winflexbison via choco.")
-        else:
-            flex_path = which("flex")
-            if not flex_path:
-                raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
+        flex_path = which("flex")
+        if not flex_path:
+            raise Exception("Flex not found in system PATH. Please install flex on Linux/macOS.")
 
         tc.variables["FLEX_EXECUTABLE"] = flex_path.replace("\\", "\\\\")
         tc.generate()

src/main.c

@@ -11,6 +11,7 @@
 #include "lexer/token.h"
 #include "memory.h"
 #include "parser/parser.h"
+#include "returnTypes.h"
 #include "runtime/runtime.h"
 #include "translator/translator.h"
 
@@ -66,8 +67,9 @@ static inline uint64_t htole64(uint64_t x) { return x; }
 #define htole64(x) OSSwapHostToLittleInt64(x)
 #define le64toh(x) OSSwapLittleToHostInt64(x)
 // Add others as needed
-#else
-#error "Unsupported platform"
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
+#include <sys/endian.h>
 #endif
 
 char *get_current_directory() {
@@ -158,7 +160,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
                char *source_path) {
   FILE *bytecode_file = fopen(joined_paths, "rb");
   if (!bytecode_file) {
-    fprintf(stderr,"cache doesnt exist... compiling from source.\n");
+    fprintf(stderr, "cache doesnt exist... compiling from source.\n");
     return 1;
   }
 
@@ -194,7 +196,7 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
   XXH64_freeState(state);
 
   if (calc_hash != stored_hash) {
-    fprintf(stderr,"cache hash mismatch (corrupted?)\n");
+    fprintf(stderr, "cache hash mismatch (corrupted?)\n");
     goto FAILED;
   }
 
@@ -268,27 +270,29 @@ int load_cache(Translated *translated_dest, char *joined_paths, uint64_t hash,
     goto FAILED;
   }
 
-  fprintf(stderr,"cache exists and is valid, so will be used.\n");
+  fprintf(stderr, "cache exists and is valid, so will be used.\n");
   fclose(bytecode_file);
   return 0;
 FAILED:
-  fprintf(stderr,"cache is invalid... compiling from source.\n");
+  fprintf(stderr, "cache is invalid... compiling from source.\n");
   fclose(bytecode_file);
   return 1;
 }
 
-Execution execute(char *path, Stack *stack) {
+Translated load_argon_file(char *path, ArErr *err) {
   clock_t start, end;
+  clock_t beginning = clock();
   double time_spent, total_time_spent = 0;
 
   const char *basename_ptr;
   size_t basename_length;
   cwk_path_get_basename(path, &basename_ptr, &basename_length);
 
-  if (!basename_ptr)
-    return (Execution){create_err(0, 0, 0, NULL, "Path Error",
-                                  "path has no basename '%s'", path),
-                       (Stack){NULL, NULL}};
+  if (!basename_ptr) {
+    *err = create_err(0, 0, 0, NULL, "Path Error", "path has no basename '%s'",
+                      path);
+    return (Translated){};
+  }
 
   char basename[FILENAME_MAX];
   memcpy(basename, basename_ptr, basename_length);
@@ -312,9 +316,9 @@ Execution execute(char *path, Stack *stack) {
 
   FILE *file = fopen(path, "r");
   if (!file) {
-    return (Execution){create_err(0, 0, 0, NULL, "File Error",
-                                  "Unable to open file '%s'", path),
-                       (Stack){NULL, NULL}};
+    *err = create_err(0, 0, 0, NULL, "File Error", "Unable to open file '%s'",
+                      path);
+    return (Translated){};
   }
 
   XXH3_state_t *hash_state = XXH3_createState();
@@ -338,15 +342,14 @@ Execution execute(char *path, Stack *stack) {
 
     LexerState state = {path, file, 0, 0, &tokens};
     start = clock();
-    ArErr err = lexer(state);
-    if (err.exists) {
+    *err = lexer(state);
+    if (err->exists) {
       darray_free(&tokens, free_token);
-      return (Execution){err, (Stack){NULL, NULL}};
+      return (Translated){};
     }
     end = clock();
     time_spent = (double)(end - start) / CLOCKS_PER_SEC;
-    total_time_spent += time_spent;
-    fprintf(stderr,"Lexer time taken: %f seconds\n", time_spent);
+    fprintf(stderr, "Lexer time taken: %f seconds\n", time_spent);
     fclose(state.file);
 
     DArray ast;
@@ -354,33 +357,31 @@ Execution execute(char *path, Stack *stack) {
     darray_init(&ast, sizeof(ParsedValue));
 
     start = clock();
-    err = parser(path, &ast, &tokens, false);
-    if (err.exists) {
+    *err = parser(path, &ast, &tokens, false);
+    if (err->exists) {
       darray_free(&tokens, free_token);
       darray_free(&ast, free_parsed);
-      return (Execution){err, (Stack){NULL, NULL}};
+      return (Translated){};
     }
     end = clock();
     time_spent = (double)(end - start) / CLOCKS_PER_SEC;
-    total_time_spent += time_spent;
-    fprintf(stderr,"Parser time taken: %f seconds\n", time_spent);
+    fprintf(stderr, "Parser time taken: %f seconds\n", time_spent);
     darray_free(&tokens, free_token);
 
     start = clock();
 
     translated = init_translator(path);
-    err = translate(&translated, &ast);
-    if (err.exists) {
+    *err = translate(&translated, &ast);
+    if (err->exists) {
       darray_free(&translated.bytecode, NULL);
       free(translated.constants.data);
       hashmap_free(translated.constants.hashmap, NULL);
       darray_free(&ast, free_parsed);
-      return (Execution){err, (Stack){NULL, NULL}};
+      return (Translated){};
     }
     end = clock();
     time_spent = (double)(end - start) / CLOCKS_PER_SEC;
-    total_time_spent += time_spent;
-    fprintf(stderr,"Translation time taken: %f seconds\n", time_spent);
+    fprintf(stderr, "Translation time taken: %f seconds\n", time_spent);
 
     darray_free(&ast, free_parsed);
 #if defined(__linux__)
@@ -444,18 +445,10 @@ Execution execute(char *path, Stack *stack) {
   gc_translated.constants.capacity = translated.constants.capacity;
   darray_free(&translated.bytecode, NULL);
   free(translated.constants.data);
-
-  start = clock();
-  RuntimeState state = init_runtime_state(gc_translated, path);
-  Stack *main_scope = create_scope(stack);
-  ArErr err = runtime(gc_translated, state, main_scope);
-  end = clock();
-  time_spent = (double)(end - start) / CLOCKS_PER_SEC;
-  total_time_spent += time_spent;
-  fprintf(stderr,"Execution time taken: %f seconds\n", time_spent);
-  fprintf(stderr,"total time taken: %f seconds\n", total_time_spent);
-
-  return (Execution){err, *main_scope};
+  total_time_spent = (double)(clock() - beginning) / CLOCKS_PER_SEC;
+  fprintf(stderr, "total time taken loading file (%s): %f seconds\n", path,
+          total_time_spent);
+  return gc_translated;
 }
 
 int main(int argc, char *argv[]) {
@@ -472,11 +465,25 @@ int main(int argc, char *argv[]) {
   char path[FILENAME_MAX];
   cwk_path_get_absolute(CWD, path_non_absolute, path, sizeof(path));
   free(CWD);
-  Execution resp = execute(path, Global_Scope);
+  ArErr err;
+  Translated translated = load_argon_file(path, &err);
+  if (err.exists) {
+    output_err(err);
+    return 1;
+  }
+  clock_t start = clock(), end;
+  RuntimeState state = init_runtime_state(translated, path);
+  Stack *main_scope = create_scope(Global_Scope);
+  err = runtime(translated, state, main_scope);
+
+  end = clock();
+  double time_spent = (double)(end - start) / CLOCKS_PER_SEC;
+  fprintf(stderr, "Execution time taken: %f seconds\n", time_spent);
+
   if (runtime_hash_table)
     hashmap_free(runtime_hash_table, NULL);
-  if (resp.err.exists) {
-    output_err(resp.err);
+  if (err.exists) {
+    output_err(err);
     return 1;
   }
   // Your main thread code

src/returnTypes.h

@@ -20,9 +20,4 @@ typedef struct ArErr {
   char type[32];
   char message[ERR_MSG_MAX_LEN];
 } ArErr;
-
-typedef struct Execution {
-  ArErr err;
-  Stack stack;
-} Execution;
 #endif // RETURN_TYPES_

src/runtime/call/call.c

@@ -16,8 +16,11 @@
 #include <string.h>
 
 #if defined(_WIN32)
-#include <psapi.h>
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0602
+#endif
 #include <windows.h>
+#include <psapi.h>
 
 double get_memory_usage_mb() {
   PROCESS_MEMORY_COUNTERS pmc;

testing.ar

@@ -8,3 +8,8 @@ let say_hi(name) = do
     return "hello "+u+", how are you?"
 
 term.log(say_hi("william"))
+
+let a = 9
+let b = 10
+
+term.log(string(a)+'+'+string(b)+'='+string(a+b))

windows-profile.txt

@@ -0,0 +1,12 @@
+[settings]
+os=Windows
+compiler=gcc
+compiler.version=12
+compiler.libcxx=libstdc++11
+compiler.threads=posix
+compiler.exception=seh
+arch=x86_64
+build_type=Release
+
+[tool_requires]
+mingw-builds/12.2.0