Merge pull request #7 from Neotron-Compute/remove-snake

Remove snake and add ASM examples

Author: thejpster

.github/workflows/build.yml

@@ -23,6 +23,16 @@ jobs:
           rustup component add llvm-tools
           cargo install cargo-binutils
 
+      - name: Add targets
+        run: |
+          sudo apt-get -y install gcc-arm-none-eabi binutils-arm-none-eabi
+
+      - name: Find slug name
+        run: |
+          slug=$(./describe.sh "${GITHUB_REF}")
+          echo "Building with slug '${slug}'"
+          echo "slug=${slug}" >> "${GITHUB_ENV}"
+
       - name: Build lib (native)
         run: |
           cargo build --verbose
@@ -31,14 +41,46 @@ jobs:
         run: |
           cargo test --verbose
 
-      - name: Build samples (Cortex-M0)
+      - name: Build samples (Cortex-M0+)
         run: |
-          cd samples && ./build.sh thumbv6m-none-eabi
+          cd samples
+          ./build.sh thumbv6m-none-eabi
+          mv release release-thumbv6m-none-eabi
 
       - name: Build samples (Cortex-M3)
         run: |
-          cd samples && ./build.sh thumbv7m-none-eabi
+          cd samples
+          ./build.sh thumbv7m-none-eabi
+          mv release release-thumbv7m-none-eabi
 
       - name: Build samples (Cortex-M4)
         run: |
-          cd samples && ./build.sh thumbv7em-none-eabi
+          cd samples
+          ./build.sh thumbv7em-none-eabi
+          mv release release-thumbv7em-none-eabi
+
+      - name: Assemble Artifacts
+        run: |
+          echo "Making ./neotron-sdk-${{ env.slug }}..."
+          mkdir -p ./neotron-sdk-${{ env.slug }}/samples
+          mv ./samples/release-thumbv6m-none-eabi ./neotron-sdk-${{ env.slug }}/samples/thumbv6m-none-eabi
+          mv ./samples/release-thumbv7m-none-eabi ./neotron-sdk-${{ env.slug }}/samples/thumbv7m-none-eabi
+          mv ./samples/release-thumbv7em-none-eabi ./neotron-sdk-${{ env.slug }}/samples/thumbv7em-none-eabi
+          echo "Compressing ./neotron-sdk-${{ env.slug }}.zip..."
+          zip -r ./neotron-sdk-${{ env.slug }}.zip ./neotron-sdk-${{ env.slug }}
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        if: ${{success()}}
+        with:
+          name: Artifacts
+          if-no-files-found: error
+          path: |
+            ./neotron-sdk-*/
+
+      - name: Create and Upload Release
+        if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
+        id: create_release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: ./neotron-sdk-${{ env.slug }}.zip

describe.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Copyright (c) Ferrous Systems, 2023
+#
+# This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
+
+set -euo pipefail
+
+GIVEN_REF=$1
+
+case "${GIVEN_REF}" in
+  refs/heads/*)
+    slug="$(git branch --show)-$(git rev-parse --short HEAD)"
+    ;;
+  refs/tags/*)
+     slug="$(echo "${GIVEN_REF}" | awk '{split($0,a,"/"); print a[3]}')"
+     ;;
+  refs/pull/*/merge)
+     slug="pr-$(echo "${GIVEN_REF}" | awk '{split($0,a,"/"); print a[3]}')-$(git rev-parse --short HEAD)"
+     ;;
+esac
+
+echo "${slug}"

samples/Cargo.toml

@@ -3,9 +3,9 @@ members = [
     "fault",
     "hello",
     "input-test",
-    "snake",
     "panic",
 ]
+resolver = "2"
 
 [profile.release]
 opt-level = "z"

samples/README.md

@@ -41,3 +41,11 @@ This application panics, printing a nice panic message.
 ## [`fault`](./fault)
 
 This application generates a Hard Fault.
+
+## [`asmhello`](./asmhello)
+
+A basic "Hello, world" but written in ARM assembly. It prints the string "Hello, world" to *standard output* and then exits with an exit code of 0.
+
+## [`chello`](../chello)
+
+A basic "Hello, world" but written in C. It prints the string "Hello, world" to *standard output* and then exits with an exit code of 0.

samples/asmhello/.gitignore

@@ -0,0 +1,2 @@
+*.elf
+*.o

samples/asmhello/asmhello.S

@@ -0,0 +1,35 @@
+.syntax unified
+.thumb
+.cpu cortex-m0plus
+.global app_entry
+.thumb_func
+
+.text
+.section ".text"
+
+// r0 will contain a pointer to the syscall table
+// the write function is the third entry (offset 8)
+// and takes the arguments r0=handle, r1=pointer, r2=length
+app_entry:
+    // Save registers
+    push {r0, r1, r2, lr}
+    // Fetch write function address
+    ldr r3, [r0, #8]
+    // Set up data length
+    movs r2, #13
+    // Set up file handle
+    movs r0, #1
+    // Set up data pointer
+    ldr r1, =message
+    // Call write function
+    blx r3
+    // Set return value
+    movs r0, #0
+    // Exit
+    pop {r1, r2, r3, pc}
+
+.data
+.section ".rodata"
+
+message:
+.ascii "Hello world!\n"

samples/asmhello/build.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+arm-none-eabi-gcc -mcpu=cortex-m0 -Wl,-T../neotron-cortex-m.ld -o asmhello.elf asmhello.S -nostdlib

samples/build.sh

@@ -24,6 +24,16 @@ cargo build
 echo "Building for ${TARGET}"
 cargo build --target ${TARGET} --release
 
-for program in panic hello fault input-test snake; do
+pushd chello
+./build.sh
+popd
+
+pushd asmhello
+./build.sh
+popd
+
+for program in panic hello fault input-test; do
     cp ./target/${TARGET}/release/${program} ./release/${program}.elf
 done
+cp ./asmhello/asmhello.elf ./release
+cp ./chello/chello.elf ./release

samples/chello/.gitignore

@@ -0,0 +1 @@
+*.elf

samples/chello/build.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+arm-none-eabi-gcc -Os -mcpu=cortex-m0 -Wl,-T../neotron-cortex-m.ld -o chello.elf chello.c -nostdlib