Next

.github/workflows/ci.yml

@@ -2,10 +2,10 @@ name: ci.yml
 
 on:
   push:
-    branches:
-      - master
+    branches: ['master', 'next']
   pull_request:
     types: [ opened, synchronize, reopened ]
+    branches: ['master', 'next']
 
 jobs:
   linux-x86:
@@ -19,10 +19,57 @@ jobs:
           sudo apt-get install -y cmake g++
 
       - name: Configure
-        run: cmake . -B build
+        run: cmake -B build
 
       - name: Build
         run: cmake --build build
 
       - name: Test x86
         run: cd build && ./test
+
+  linux-aarch64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake g++
+
+      - name: Configure
+        run: cmake -B build
+
+      - name: Build
+        run: cmake --build build
+
+      - name: Test AArch64
+        run: cd build && ./test
+
+  windows-x86:
+    runs-on: windows-latest
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          update: true
+
+      - name: Dependencies
+        shell: msys2 {0}
+        run: pacman -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-python --noconfirm
+
+      - name: Configure
+        shell: msys2 {0}
+        run: cmake -B build -G Ninja -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
+
+      - name: Build
+        shell: msys2 {0}
+        run: cmake --build build
+
+      - name: Test
+        shell: msys2 {0}
+        run: cd build && ./test.exe

CMakeLists.txt

@@ -24,19 +24,19 @@ endif()
 FetchContent_Declare(
 		vstl
 		GIT_REPOSITORY https://github.com/magistermaks/lib-vstl
-		GIT_TAG 8e590538f66e21aca2558c3029a275725a8f2be3
+		GIT_TAG c7f1069ea12fbe8087067841c491940fc3f6dc7f
 )
 
 FetchContent_MakeAvailable(vstl)
 
 set(ASMIO_WRITERS
-		src/asm/x86/writer.hpp
-		src/asm/aarch64/writer.hpp
+		src/asmio/x86/writer.hpp
+		src/asmio/aarch64/writer.hpp
 )
 
 set(ASMIO_BRIDGES "${ASMIO_WRITERS}")
 
-list(TRANSFORM ASMIO_BRIDGES REPLACE "src/asm/(.*)/writer.hpp" "${PROJECT_BINARY_DIR}/src/generated/\\1.hpp")
+list(TRANSFORM ASMIO_BRIDGES REPLACE "src/asmio/(.*)/writer.hpp" "${PROJECT_BINARY_DIR}/src/generated/\\1.hpp")
 list(TRANSFORM ASMIO_WRITERS PREPEND "${PROJECT_SOURCE_DIR}/")
 
 add_custom_command(
@@ -70,7 +70,8 @@ add_executable(test
 		test/elf.cpp
 )
 target_link_libraries(test PRIVATE asmiov)
-target_include_directories(test PRIVATE ${ASMIOV_INCLUDE_DIRS} ${vstl_SOURCE_DIR})
+target_include_directories(test PRIVATE ${ASMIOV_INCLUDE_DIRS})
+target_link_libraries(test PRIVATE vstl)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	target_compile_options(asmiov PUBLIC

README.md

@@ -4,8 +4,7 @@ code generation using the build-in C++ API with syntax closely matching the sour
 The project consists of a `tasml` CLI assembler and a `test` unit test runner. 
 
 The code unique to the CLI utility is separated from the rest of 
-the library and located in the `/src/tasml`. The `/src/file` contains binary file IO, and `/src/asm` 
-implements the assembler itself.
+the library (located in `/src/asmio`) and located in the `/src/tasml`.
 
 ## Utility
 The example of the syntax used by `tasml` utility, the API version of the exact same code can be seen below.