aarch64 ble/observer font (#6)

Author: markfirmware

.github/workflows/main.yml

@@ -31,6 +31,8 @@ jobs:
         cp -a $REPO-armv6.img boot/
         ./zig/zig build -Darmv7
         cp -a $REPO-armv7.img boot/
+        ./zig/zig build -Darmv8
+        cp -a $REPO-armv8.img boot/
     - name: release draft
       env:
         GITHUB_USER: $GITHUB_ACTOR

README.md

@@ -1,25 +1,20 @@
-zig logo is displayed
-
-The frame buffer cursor moves around the screen in response to the tv remote controller buttons. This requires the Consumer Electronics Control (CEC) feature on the tv.
-
-Successfully tested on rpi3b, rpi3b+
-
-Not yet working on armv6 raspberry pi models
+Privacy
+-------
 
-Not yet tested on rpi4b
+Bluetooth signals are collected and displayed on the screen
 
-Building
+Function
 --------
 
-Requires the following patch to lib/zig/std/fmt.zig:
+zig logo is displayed
 
-replace
+The frame buffer cursor moves around the screen in response to the tv remote controller buttons. This requires the Consumer Electronics Control (CEC) feature on the tv.
 
-    const digit = a % base;
+Presently only working on rpi3b+ due to some code generation issues
 
-with
+Not yet working on armv6 raspberry pi models
 
-    const digit = a - base * (a / base);
+Not yet tested on rpi4b
 
 Testing
 -------

assets/BCM4345C0.hcd

@@ -14,6 +14,6 @@ kernel=zig-bare-metal-raspberry-pi-armv6.img
 [rpi2]
 kernel=zig-bare-metal-raspberry-pi-armv7.img
 [rpi3]
-kernel=zig-bare-metal-raspberry-pi-armv7.img
+kernel=zig-bare-metal-raspberry-pi-armv8.img
 [rpi4]
-kernel=zig-bare-metal-raspberry-pi-armv7.img
+kernel=zig-bare-metal-raspberry-pi-armv8.img

assets/small_font.bmp

@@ -5,8 +5,9 @@ const builtin = @import("builtin");
 pub fn build(b: *Builder) !void {
     const mode = b.standardReleaseOptions();
     const want_armv6 = b.option(bool, "armv6", "Build armv6") orelse false;
-    const want_armv7 = b.option(bool, "armv7", "Build armv7 (default)") orelse false;
-    const want_qemu = b.option(bool, "qemu", "Build qemu variant of armv7") orelse false;
+    const want_armv7 = b.option(bool, "armv7", "Build armv7") orelse false;
+    const want_armv8 = b.option(bool, "armv8", "Build armv8 (default)") orelse false;
+    const want_qemu = b.option(bool, "qemu", "Build qemu variant") orelse false;
     const want_nodisplay = b.option(bool, "nodisplay", "No display for qemu") orelse false;
 
     const exec_name = "zig-bare-metal-raspberry-pi";
@@ -21,21 +22,25 @@ pub fn build(b: *Builder) !void {
         arch = builtin.Arch{ .arm = builtin.Arch.Arm32.v6 };
         subarch = 6;
         kernel_name = exec_name ++ "-armv6.img";
-    } else {
+    } else if (want_armv7) {
         arch = builtin.Arch{ .arm = builtin.Arch.Arm32.v7 };
         subarch = 7;
+        kernel_name = exec_name ++ "-armv7.img";
+    } else {
+        arch = builtin.Arch{ .aarch64 = builtin.Arch.Arm64.v8 };
+        subarch = 8;
         if (want_qemu) {
-            kernel_name = exec_name ++ "-armv7-qemu.img";
+            kernel_name = exec_name ++ "-armv8-qemu.img";
         } else {
-            kernel_name = exec_name ++ "-armv7.img";
+            kernel_name = exec_name ++ "-armv8.img";
         }
     }
     const os = builtin.Os.freestanding;
     const environ = builtin.Abi.eabihf;
     exe.setTarget(arch, os, environ);
     exe.addBuildOption(u32, "subarch", subarch);
     exe.addBuildOption(bool, "is_qemu", want_qemu);
-    exe.setLinkerScriptPath(if (want_qemu) "src/linker-qemu.ld" else "src/linker.ld");
+    exe.setLinkerScriptPath(if (want_qemu and subarch <  8) "src/linker-qemu.ld" else "src/linker.ld");
 
     const run_objcopy = b.addSystemCommand([_][]const u8{
         "llvm-objcopy-6.0", exe.getOutputPath(),
@@ -47,14 +52,25 @@ pub fn build(b: *Builder) !void {
     b.default_step.dependOn(&run_objcopy.step);
 
     var run_qemu_args = std.ArrayList([]const u8).init(b.allocator);
-    try run_qemu_args.appendSlice([_][]const u8{
-        "qemu-system-arm",
-        "-kernel", exe.getOutputPath(),
-        "-m", "256",
-        "-M", "raspi2",
-        "-serial", "stdio",
-        "-display", if (want_nodisplay) "none" else "gtk",
-    });
+    if (!want_qemu) {
+        try run_qemu_args.appendSlice([_][]const u8{
+            "echo", "-Dqemu is required to run qemu",
+        });
+    } else if (subarch == 6) {
+        try run_qemu_args.appendSlice([_][]const u8{
+            "echo", "-Darmv6 will not run on qemu",
+        });
+    } else {
+        try run_qemu_args.appendSlice([_][]const u8{
+            if (subarch == 8) "qemu-system-aarch64" else "qemu-system-arm",
+            "-kernel", exe.getOutputPath(),
+            "-m", "256",
+            "-M", if (subarch == 7) "raspi2" else "raspi3",
+            "-serial", if (subarch == 8) "none" else "stdio",
+            "-serial", if (subarch == 8) "stdio" else "none",
+            "-display", if (want_nodisplay) "none" else "gtk",
+        });
+    }
     const run_qemu = b.addSystemCommand(run_qemu_args.toSliceConst());
     run_qemu.step.dependOn(&exe.step);
 

assets/font.bmp renamed to assets/tetris_font.bmp

@@ -16,3 +16,4 @@
 * apply power to the pi
 * you should see the zig logo displayed along with a changing banner of colored lines
 * if your tv has CEC (Consumer Electronics Control) then the frame buffer cursor will move in response to tv remote controller buttons
+* nearby ble (bluetooth low energy) devices should be listed on the screen

assets/font.png renamed to assets/tetris_font.png

@@ -1,3 +1,4 @@
+
 pub const PERIPHERAL_BASE = if (build_options.subarch >= 7) 0x3F000000 else 0x20000000;
 
 var already_panicking: bool = false;
@@ -28,8 +29,12 @@ pub fn io(comptime StructType: type, offset: u32) *volatile StructType {
 
 pub fn hang(comptime format: []const u8, args: ...) noreturn {
     log(format, args);
+    var time = milliseconds.read();
+    while (!serial.isOutputQueueEmpty()) {
+        serial.loadOutputFifo();
+    }
     while (true) {
-        if (build_options.subarch >= 7) {
+      if (build_options.subarch >= 7) {
             v7.wfe();
         }
     }
@@ -47,25 +52,25 @@ pub const v7 = struct {
     }
 };
 
-pub fn sp() u32 {
+pub fn sp() usize {
     var word = asm("mov %[word], sp"
         : [word] "=r" (-> usize));
     return word;
 }
 
-pub fn cpsr() u32 {
+pub fn cpsr() usize {
     var word = asm("mrs %[word], cpsr"
         : [word] "=r" (-> usize));
     return word;
 }
 
-pub fn spsr() u32 {
+pub fn spsr() usize {
     var word = asm("mrs %[word], spsr"
         : [word] "=r" (-> usize));
     return word;
 }
 
-pub fn sctlr() u32 {
+pub fn sctlr() usize {
     var word = asm("mrc p15, 0, %[word], c1, c0, 0"
         : [word] "=r" (-> usize));
     return word;
@@ -89,38 +94,72 @@ pub fn dsbSt() void {
 }
 
 pub fn setVectorBaseAddressRegister(address: u32) void {
-    asm volatile("mcr p15, 0, %[address], cr12, cr0, 0"
-        :
-        : [address] "{r0}" (address)
-    );
+    if (build_options.subarch >= 8) {
+        asm volatile("mcr p15, 0, %[address], cr12, cr0, 0"
+            :
+            : [address] "{x0}" (address)
+        );
+    } else {
+        asm volatile("mcr p15, 0, %[address], cr12, cr0, 0"
+            :
+            : [address] "{r0}" (address)
+        );
+    }
 }
 
 pub fn setCntfrq(word: u32) void {
-    asm volatile("mcr p15, 0, %[word], c14, c0, 0"
-        :
-        : [word] "{r0}" (word)
-    );
+    if (build_options.subarch >= 8) {
+        asm volatile("msr cntfrq_el0, %[word]"
+            :
+            : [word] "{x0}" (word)
+        );
+    } else {
+        asm volatile("mcr p15, 0, %[word], c14, c0, 0"
+            :
+            : [word] "{r0}" (word)
+        );
+    }
 }
 
 pub fn cntfrq() u32 {
-    var word = asm("mrc p15, 0, %[word], c14, c0, 0"
-        : [word] "=r" (-> usize));
-    return word;
+    var word: usize = undefined;
+    if (build_options.subarch >= 8) {
+        word = asm volatile("mrs %[word], cntfrq_el0"
+            : [word] "=r" (-> usize)
+        );
+    } else {
+        word = asm("mrc p15, 0, %[word], c14, c0, 0"
+            : [word] "=r" (-> usize)
+        );
+    }
+    return @truncate(u32, word);
 }
 
 pub fn cntpct32() u32 {
-    return asm("mrrc p15, 0, %[cntpct_low], r1, c14"
-        : [cntpct_low] "=r" (-> usize)
-        :
-        : "r1"
-    );
+    var word: usize = undefined;
+    if (build_options.subarch >= 8) {
+        word = asm volatile("mrs %[word], cntpct_el0"
+            : [word] "=r" (-> usize)
+        );
+    } else {
+        word = asm("mrrc p15, 0, %[cntpct_low], r1, c14"
+            : [cntpct_low] "=r" (-> usize)
+            :
+            : "r1"
+        );
+    }
+    return @truncate(u32, word);
 }
 
 // Loop count times in a way that the compiler won't optimize away.
 pub fn delay(count: usize) void {
     var i: usize = 0;
     while (i < count) : (i += 1) {
-        asm volatile("mov r0, r0");
+        if (build_options.subarch >= 8) {
+            asm volatile("mov x0, x0");
+        } else {
+            asm volatile("mov r0, r0");
+        }
     }
 }
 
@@ -166,14 +205,15 @@ pub fn setBssToZero() void {
     @memset((*volatile [1]u8)(&__bss_start), 0, @ptrToInt(&__bss_end) - @ptrToInt(&__bss_start));
 }
 
+
 comptime {
     asm(
         \\.section .text.boot // .text.boot to keep this in the first portion of the binary
         \\.globl _start
         \\_start:
     );
 
-    if (build_options.subarch >= 7) {
+    if (build_options.subarch == 7) {
         asm(
             \\ mrc p15, 0, r0, c0, c0, 5
             \\ and r0,#3
@@ -188,24 +228,79 @@ comptime {
         );
     }
 
-    asm(
-        \\ cps #0x1f // enter system mode
-        \\ mov sp,#0x08000000
-        \\ bl kernelMain
-        \\
-        \\.section .text.exception_vector_table
-        \\.balign 0x80
-        \\exception_vector_table:
-        \\ b exceptionEntry0x00
-        \\ b exceptionEntry0x01
-        \\ b exceptionEntry0x02
-        \\ b exceptionEntry0x03
-        \\ b exceptionEntry0x04
-        \\ b exceptionEntry0x05
-        \\ b exceptionEntry0x06
-        \\ b exceptionEntry0x07
-    );
+    if (build_options.subarch <= 7) {
+        asm(
+            \\ cps #0x1f // enter system mode
+            \\ mov sp,#0x08000000
+            \\ bl kernelMain
+            \\
+            \\.section .text.exception_vector_table
+            \\.balign 0x80
+            \\exception_vector_table:
+            \\ b exceptionEntry0x00
+            \\ b exceptionEntry0x01
+            \\ b exceptionEntry0x02
+            \\ b exceptionEntry0x03
+            \\ b exceptionEntry0x04
+            \\ b exceptionEntry0x05
+            \\ b exceptionEntry0x06
+            \\ b exceptionEntry0x07
+        );
+    } else {
+        asm(
+            \\ mrs x0,mpidr_el1
+            \\ mov x1,#0xC1000000
+            \\ bic x0,x0,x1
+            \\ cbz x0,master
+            \\hang:
+            \\ wfe
+            \\ b hang
+            \\master:
+            \\ mov sp,#0x08000000
+            \\ mov x0,#0x1000 //exception_vector_table
+            \\ msr vbar_el3,x0
+            \\ msr vbar_el2,x0
+            \\ msr vbar_el1,x0
+            \\ bl kernelMain
+            \\.balign 0x800
+            \\.section .text.exception_vector_table
+            \\exception_vector_table:
+            \\.balign 0x80
+            \\ b exceptionEntry0x00
+            \\.balign 0x80
+            \\ b exceptionEntry0x01
+            \\.balign 0x80
+            \\ b exceptionEntry0x02
+            \\.balign 0x80
+            \\ b exceptionEntry0x03
+            \\.balign 0x80
+            \\ b exceptionEntry0x04
+            \\.balign 0x80
+            \\ b exceptionEntry0x05
+            \\.balign 0x80
+            \\ b exceptionEntry0x06
+            \\.balign 0x80
+            \\ b exceptionEntry0x07
+            \\.balign 0x80
+            \\ b exceptionEntry0x08
+            \\.balign 0x80
+            \\ b exceptionEntry0x09
+            \\.balign 0x80
+            \\ b exceptionEntry0x0A
+            \\.balign 0x80
+            \\ b exceptionEntry0x0B
+            \\.balign 0x80
+            \\ b exceptionEntry0x0C
+            \\.balign 0x80
+            \\ b exceptionEntry0x0D
+            \\.balign 0x80
+            \\ b exceptionEntry0x0E
+            \\.balign 0x80
+            \\ b exceptionEntry0x0F
+        );
+    }
 }
 
 const build_options = @import("build_options");
-const log = @import("serial.zig").log;
+const log = serial.log;
+const serial = @import("serial.zig");