Move lightshow into dir

Note: this currently has a rustc compiler panic trying to use
the `#[no_core]` attribute, which seems poorly supported

.gitignore

@@ -0,0 +1,5 @@
+
+*.o
+gamarjoba_munde/gamarjoba
+baremetal_gamarjoba/baremetal_gamarjoba
+keyboard/keyboard_kernel

README

@@ -1,12 +0,0 @@
-Sandbox for playing with low-level programming stuff
-
-
-The following projects are inspirational:
-
-    https://github.com/programble/bare-metal-tetris
-    http://0xax.blogspot.com/2014/09/say-hello-to-x64-assembly-part-3.html
-
-
-x86 instruction set reference:
-    http://x86.renejeschke.de/
-    http://www.cs.virginia.edu/~evans/cs216/guides/x86.html#registers

README.md

@@ -0,0 +1,21 @@
+# Bare metal programming sandbox
+
+This repo is a sandbox for experimenting with bare metal code and other
+low-level programming concerns.
+
+This repo contains the following executables:
+
+* `gamarjoba_munde` - x86-64 linux binary that prints the text "Gamarjoba, Munde"
+* `baremetal_gamarjoba` - bare-metal x86 program run with QEMU
+* `keyboard` - reads keycode information from keyboard. Also uses both Rust and C includes.
+* `lightshow` - NOTE: Broken - an attempt at a substantial #[no_core] rust object file, currently crashes rustc
+
+# Useful links
+
+The following projects are inspirational:
+* https://github.com/programble/bare-metal-tetris
+* http://0xax.blogspot.com/2014/09/say-hello-to-x64-assembly-part-3.html
+
+## x86 instruction set reference:
+* http://x86.renejeschke.de/
+* http://www.cs.virginia.edu/~evans/cs216/guides/x86.html#registers

baremetal_gamarjoba/baremetal_gamarjoba.asm

@@ -1,5 +1,5 @@
-%include "multiboot_header.asm"
-%include "x86_vram.asm"
+%include "../common/multiboot_header.asm"
+%include "../common/x86_vram.asm"
 
 %define stack_size 0x1000
 
@@ -13,8 +13,11 @@ print_word db 'Hahaha',0
 
 section .text
 
+; Defined in include.c
 extern get_vram_offset
 extern c_entry
+
+; Defined in common/x86_vram_functions.asm
 global write_to_coord
 
 global boot
@@ -52,4 +55,4 @@ halt:
     hlt
     jmp halt
 
-%include "x86_vram_functions.asm"
+%include "../common/x86_vram_functions.asm"

common/x86_vram.asm

@@ -1,3 +1,5 @@
+%ifndef X86_VRAM_ASM
+%define X86_VRAM_ASM
 
 ; x86 video stuff
 ; each character cell is a 16 bit word
@@ -31,3 +33,4 @@
 %define BG.GRAY    7 << 12
 %define BG.BRIGHT  8 << 12
 
+%endif

justfile

@@ -0,0 +1,50 @@
+default:
+    just --list
+
+run_gamarjoba: build_gamarjoba
+    ./gamarjoba_munde/gamarjoba
+
+build_gamarjoba:
+    nasm -f elf64 -o gamarjoba_munde/gamarjoba.o gamarjoba_munde/gamarjoba.asm
+    ld -o gamarjoba_munde/gamarjoba gamarjoba_munde/gamarjoba.o
+
+build_baremetal_gamarjoba:
+    #!/usr/bin/env bash
+    cd baremetal_gamarjoba
+    gcc -m32 -ffreestanding -o include.o -c include.c
+    nasm -f elf32 -i ../common baremetal_gamarjoba.asm
+    ld -m elf_i386 -nostdlib -T ../common/linker.ld baremetal_gamarjoba.o include.o -o baremetal_gamarjoba
+
+
+run_baremetal_gamarjoba: build_baremetal_gamarjoba
+    #!/usr/bin/env bash
+    cd baremetal_gamarjoba
+    qemu-system-i386 -kernel baremetal_gamarjoba
+
+
+build_keyboard:
+    #!/usr/bin/env bash
+    cd keyboard
+    gcc -m32 -ffreestanding -o c_keyboard.o -c c_keyboard.c
+    rustc --emit obj -o rust_keyboard.o --target i686-unknown-linux-gnu keyboard.rs
+    nasm -f elf32 -i ../common keyboard.asm
+    ld -m elf_i386 -nostdlib -T ../common/linker.ld keyboard.o c_keyboard.o rust_keyboard.o -o keyboard_kernel
+
+run_keyboard: build_keyboard
+    qemu-system-i386 -kernel keyboard/keyboard_kernel
+
+run_terminal_keyboard: build_keyboard
+    qemu-system-i386 -display curses -kernel keyboard/keyboard_kernel
+
+build_lightshow:
+    #!/usr/bin/env bash
+    cd lightshow
+    rustc --emit obj -o lightshow_rust.o --target i686-unknown-linux-gnu -g lightshow.rs
+    nasm -f elf32 -i ../common -g lightshow.asm
+    ld -m elf_i386 -nostdlib -T ../common/linker.ld lightshow.o lightshow_rust.o -o lightshow
+
+run_lightshow: build_lightshow
+    qemu-system-i386 -kernel lightshow
+
+debug_lightshow: build_lightshow
+    qemu-system-i386 -kernel lightshow -gdb tcp::9999 -S

keyboard/keyboard.asm

@@ -1,5 +1,5 @@
-%include "multiboot_header.asm"
-%include "x86_vram.asm"
+%include "../common/multiboot_header.asm"
+%include "../common/x86_vram.asm"
 
 extern c_entry
 extern print_int
@@ -56,4 +56,4 @@ scan:
     xor al, al
     ret
 
-%include "x86_vram_functions.asm"
+%include "../common/x86_vram_functions.asm"

lightshow/lightshow.asm

@@ -1,4 +1,4 @@
-%include "x86_vram.asm"
+%include "../common/x86_vram.asm"
 
 extern rust_entry
 
@@ -12,8 +12,8 @@ section .data
 section .text
 global boot
 
-%include "multiboot_header.asm"
-%include "x86_vram_functions.asm"
+%include "../common/multiboot_header.asm"
+%include "../common/x86_vram_functions.asm"
 
 boot:
     mov esp, stack + 0x100

lightshow/lightshow.rs

@@ -1,5 +1,5 @@
 
-#![feature(lang_items, start, no_core)]
+#![feature(lang_items, no_core)]
 #![no_core]
 #![no_main]
 
@@ -10,10 +10,18 @@ extern fn eh_personality() {}
 fn panic_fmt() -> ! { loop {} }
 
 #[lang = "panic"]
-pub fn panic(expr_file_line: &(&'static str, &'static str, u32)) -> ! { panic_fmt() }
+pub fn panic(_expr_file_line: &(&'static str, &'static str, u32)) -> ! { panic_fmt() }
+
+#[lang = "panic_location"]
+struct Location<'a> {
+    _file: &'a str,
+    _line: u32,
+    _col: u32,
+}
+
 
 #[lang = "sized"]
-trait Sized {}
+pub trait Sized {}
 
 #[lang = "copy"]
 trait Copy {}
@@ -21,7 +29,7 @@ trait Copy {}
 #[lang = "add"]
 pub trait Add<RHS=Self> {
     type Output;
-    fn add(self, rhs: RHS) -> Self::Output;
+    fn add(self, _rhs: RHS) -> Self::Output;
 }
 
 /* this can be bogus, apparently? */
@@ -33,12 +41,12 @@ impl Add for usize {
 #[lang = "mul"]
 pub trait Mul<RHS = Self> {
     type Output;
-    fn mul(self, rhs: RHS) -> Self::Output;
+    fn mul(self, _rhs: RHS) -> Self::Output;
 }
 
 impl Mul for usize {
     type Output = usize;
-    fn mul(self, rhs: usize) -> usize { 1 }
+    fn mul(self, _rhs: usize) -> usize { 1 }
 }
     
 
@@ -54,6 +62,7 @@ pub extern fn rust_entry() {
 }
 
 const X86_COLS: usize = 80;
+#[allow(dead_code)]
 const X86_ROWS: usize = 25;
 const VRAM_OFFSET: usize  = 0xb8000;