coelner/fomu-workshop
1
0
Fork 0
mirror of https://github.com/im-tomu/fomu-workshop.git synced 2024-09-20 03:10:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to zig 0.8.0

Browse Source
This commit is contained in:
daurnimator 2021-08-01 22:17:25 +10:00
parent 9818174c87
commit 9dafec418c
No known key found for this signature in database
GPG Key ID: 45B429A8F9D9D22A
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/test.yml vendored
View File

@ -46,8 +46,8 @@ jobs:
- name: Install (Ubuntu)
if: matrix.os == 'ubuntu'
run: |
curl -L https://ziglang.org/download/0.6.0/zig-linux-x86_64-0.6.0.tar.xz | tar -xJf -
echo "$(pwd)/zig-linux-x86_64-0.6.0" >> $GITHUB_PATH
curl -L https://ziglang.org/download/0.8.0/zig-linux-x86_64-0.8.0.tar.xz | tar -xJf -
echo "$(pwd)/zig-linux-x86_64-0.8.0" >> $GITHUB_PATH
- name: Install (Mac OS)
if: matrix.os == 'macos'
@ -56,7 +56,7 @@ jobs:
- name: Install (Windows)
if: matrix.os == 'windows'
run: |
choco install zig --version 0.6.0
choco install zig --version 0.8.0
ln -s $(which python) /usr/bin/python3
- run: python ./get-toolchain.py

6
riscv-zig-blink/README.md
View File

@ -1,12 +1,12 @@
# riscv-zig-blink
Written against zig 0.6.0
Written against zig 0.8.0
You can obtain the zig compiler via https://ziglang.org/download/
e.g. a linux user might run:
```
curl -L https://ziglang.org/builds/zig-linux-x86_64-0.6.0.tar.xz | tar -xJf -
alias zig=./zig-linux-x86_64-0.6.0/zig
curl -L https://ziglang.org/download/0.8.0/zig-linux-x86_64-0.8.0.tar.xz | tar -xJf -
alias zig=./zig-linux-x86_64-0.8.0/zig
```
Run `zig build --help` from this directory for usage and options.

7
riscv-zig-blink/src/fomu.zig
View File

@ -40,14 +40,13 @@ pub fn panic(message: []const u8, stack_trace: ?*std.builtin.StackTrace) noretur
.BRMSBEXT = 0,
});
messibleOutStream.print("PANIC: {}\r\n", .{message}) catch void;
messibleWriter.print("PANIC: {s}\r\n", .{message}) catch void;
while (true) {
@breakpoint();
}
}
const WriteError = error{};
fn messibleWrite(self: void, bytes: []const u8) WriteError!usize {
while (true) {
@ -55,7 +54,7 @@ fn messibleWrite(self: void, bytes: []const u8) WriteError!usize {
if (bytes_written != 0) return bytes_written;
}
}
pub const messibleOutStream = std.io.OutStream(void, WriteError, messibleWrite){.context = {}};
pub const messibleWriter = std.io.Writer(void, WriteError, messibleWrite){ .context = {} };
const ReadError = error{};
fn messibleRead(self: void, buffer: []u8) ReadError!usize {
@ -64,4 +63,4 @@ fn messibleRead(self: void, buffer: []u8) ReadError!usize {
if (bytes_read != 0) return bytes_read;
}
}
pub const messibleInStream = std.io.InStream(void, ReadError, messibleRead){.context = {}};
pub const messibleReader = std.io.Reader(void, ReadError, messibleRead){ .context = {} };