Cargo.lock

@@ -61,9 +61,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.90"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "autocfg"
@@ -145,9 +145,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "cc"
-version = "1.1.31"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
 dependencies = [
  "shlex",
 ]
@@ -350,12 +350,12 @@ checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 [[package]]
 name = "hbbytecode"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#6ad0b41759dacd5767b5c9cfbc1b3b11c025396a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ea736d88244ce1d85999d7ce6387a63c655b7000"
 
 [[package]]
 name = "hblang"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#6ad0b41759dacd5767b5c9cfbc1b3b11c025396a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ea736d88244ce1d85999d7ce6387a63c655b7000"
 dependencies = [
  "hashbrown 0.15.0",
  "hbbytecode",
@@ -367,7 +367,7 @@ dependencies = [
 [[package]]
 name = "hbvm"
 version = "0.1.0"
-source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#6ad0b41759dacd5767b5c9cfbc1b3b11c025396a"
+source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#ea736d88244ce1d85999d7ce6387a63c655b7000"
 dependencies = [
  "hbbytecode",
 ]
@@ -420,9 +420,9 @@ checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "hyper"
-version = "1.5.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -567,9 +567,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.161"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "limine"
@@ -718,9 +718,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -945,9 +945,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.15"
+version = "0.23.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
 dependencies = [
  "once_cell",
  "ring",
@@ -968,9 +968,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
 
 [[package]]
 name = "rustls-webpki"
@@ -1035,9 +1035,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.131"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
  "memchr",

kernel/src/holeybytes/kernel_services/logging_service.rs

@@ -14,7 +14,7 @@ pub fn log_msg_handler(_vm: &mut Vm, mem_addr: u64, length: usize) -> Result<(),
     let file_name = "None";
     let line_number = 0;
 
-    match core::str::from_utf8(&msg_vec[..msg_vec.len() - 1]) {
+    match core::str::from_utf8(&msg_vec[..msg_vec.len()]) {
         Ok(strr) => {
             use log::Level::*;
             let log_level = match log_level {

kernel/src/holeybytes/kernel_services/mem_serve.rs

@@ -31,6 +31,15 @@ unsafe fn memcpy(mut dest: *mut u8, mut src: *const u8, mut count: usize) {
         return;
     }
 
+    // let dest_misalignment = dest as usize & 7;
+    // if dest_misalignment != 0 {
+    //     let align_bytes = 8 - dest_misalignment;
+    //     src.copy_to_nonoverlapping(dest, align_bytes);
+    //     dest = dest.add(align_bytes);
+    //     src = src.add(align_bytes);
+    //     count -= align_bytes;
+    // }
+
     while count >= 8 {
         if (src as usize) & 7 == 0 && (dest as usize) & 7 == 0 {
             *(dest as *mut u64) = *(src as *const u64);

sysdata/libraries/horizon_api/src/lib.hb

@@ -1,7 +1,5 @@
 stn := @use("../../stn/src/lib.hb");
-.{string, memory, buffer, log} := stn
+.{string, memory, buffer} := stn
-
-render := @use("../../../libraries/render/src/lib.hb")
 
 input := @use("../../intouch/src/lib.hb")
 
@@ -14,34 +12,20 @@ WindowID := struct {
 
 VoidWindowID := WindowID.(0, 0)
 
-create_window := fn(channel: int): ^render.Surface {
+create_window := fn(channel: int): WindowID {
 	// get the horizon buffer
 	// request a new window and provide the callback buffer
 	// wait to recieve a message
 
 	windowing_system_buffer := buffer.search("XHorizon\0")
-	mem_buf := memory.request_page(1)
 
 	if windowing_system_buffer == 0 {
-		return 0
+		return VoidWindowID
 	} else {
-		// msg := "\{01}\0"
+		msg := "\{01}\0"
-		// msg_length := 2
+		msg_length := 2
 
-		// @as(void, @eca(3, windowing_system_buffer, msg, msg_length))
+		@as(void, @eca(3, windowing_system_buffer, msg, msg_length))
-
+		return WindowID.(1, 0)
-		x := 0
-		loop if x > 1000 break else x += 1
-
-		ret := buffer.recv(windowing_system_buffer, mem_buf, 4096)
-		if ret == 0 {
-			log.info("No messages\0")
-		}
-
-		if *mem_buf == 0 {
-			log.info("No messages\0")
-		}
-
-		return 0
 	}
 }

sysdata/libraries/render/TODO.md

@@ -1,33 +0,0 @@
-# Images
-- General over image format
-- Support formats:
-    - PNG
-- Animation
-
-# API
-- Font Loader
-    - VGA fonts
-- Colour operations:
-    - Alpha Composite
-    - Invert
-- Surface Operations:
-    - FlipV
-    - FlipH
-    - Resize
-    - Wrap the colour operations
-    - Tile
-    - Gradient overlay
-- Draw operations:
-    - Curve raster algorithm
-    - VGA font fast blit
-    - VGA font render
-    - Polygon
-
-# Backend
-- SVGA Driver
-- Support whatever vulkan stuff able is cooking
-
-# Bits and bobs on the table
-- Funny 3D Renderer
-- stn.memory.swap & kernel message
-- Make memory.{copy, set} smart

sysdata/libraries/render/src/image.hb

@@ -1,5 +1,5 @@
-.{Color, Surface, new_surface} := @use("./lib.hb");
+.{Color, Surface} := @use("./lib.hb");
-.{log, memory} := @use("../../stn/src/lib.hb")
+.{log} := @use("../../stn/src/lib.hb")
 
 BitmapFileHeader := packed struct {
 	img_type: u16,
@@ -64,40 +64,3 @@ surface_from_bmp := fn(bmp: ^u8): Surface {
 
 	return .(@bitcast(bmp), @intcast(info_header.width), @intcast(info_header.height))
 }
-
-new_surface_from_bmp := fn(bmp: ^u8): Surface {
-	file_header := @as(^BitmapFileHeader, @bitcast(bmp))
-	if file_header.img_type != 0x4D42 {
-		log.error("failed to load bmp image: not a bmp image, idiot\0")
-		return @as(Surface, idk)
-	}
-	info_header := @as(^BitmapInfoHeader, @bitcast(bmp + @sizeof(BitmapFileHeader)))
-	bmp += file_header.offset
-
-	width := @as(int, @intcast(info_header.width))
-	height := @as(int, @intcast(info_header.height))
-
-	surface := new_surface(width, height)
-	top_start_idx := surface.buf
-	bottom_start_idx := surface.buf + width * (height - 1)
-	rows_to_copy := height
-	top_cursor := @as(^Color, @bitcast(bmp))
-	bottom_cursor := top_cursor + width * (height - 1)
-
-	loop if rows_to_copy <= 1 break else {
-		@inline(memory.copy, Color, top_cursor, bottom_start_idx, @bitcast(width))
-		@inline(memory.copy, Color, bottom_cursor, top_start_idx, @bitcast(width))
-
-		top_start_idx += surface.width
-		bottom_start_idx -= surface.width
-		top_cursor += width
-		bottom_cursor -= width
-		rows_to_copy -= 2
-	}
-
-	if rows_to_copy == 1 {
-		@inline(memory.copy, Color, top_cursor, top_start_idx, @bitcast(width))
-	}
-
-	return surface
-}

sysdata/libraries/render/src/lib.hb

@@ -1,3 +1,4 @@
+.{memory} := @use("../../stn/src/lib.hb")
 software := @use("software.hb")
 image := @use("image.hb")
 
@@ -6,13 +7,34 @@ mode := software
 
 init := mode.init
 doublebuffer := mode.doublebuffer
-Surface := mode.Surface
+
-new_surface := mode.new_surface
+Surface := struct {
-surface_from_ptr := mode.surface_from_ptr
+	buf: ^Color,
-clone_surface := mode.clone_surface
+	width: int,
-free_surface := mode.free_surface
+	height: int,
-index := mode.index
+}
-indexptr := mode.indexptr
+
+new_surface := fn(width: int, height: int): Surface {
+	return .(
+		@inline(memory.alloc, Color, width * height * @bitcast(@sizeof(Color))),
+		width,
+		height,
+	)
+}
+
+surface_from_ptr := fn(ptr: ^Color, width: int, height: int): Surface {
+	return .(
+		ptr,
+		width,
+		height,
+	)
+}
+
+clone_surface := fn(surface: Surface): Surface {
+	new := new_surface(surface.width, surface.height)
+	@inline(memory.copy, Color, surface.buf, new.buf, @intcast(surface.width * surface.height))
+	return new
+}
 
 // Colours
 Color := packed struct {b: u8, g: u8, r: u8, a: u8}
@@ -47,4 +69,10 @@ put_vline := mode.put_vline
 put_hline := mode.put_hline
 
 // Display
+// width := mode.width
+// height := mode.height
+// dimensions := mode.dimensions
+// set_height := mode.set_height
+// set_width := mode.set_width
+// set_dimensions := mode.set_dimensions
 sync := mode.sync

sysdata/libraries/render/src/software.hb

@@ -1,47 +1,14 @@
 .{math, memory, dt} := @use("../../stn/src/lib.hb");
-.{Color} := @use("lib.hb");
+.{Color, Surface, new_surface} := @use("lib.hb");
 .{Vec2} := math
 
-Surface := struct {
-	buf: ^Color,
-	width: int,
-	height: int,
-}
-
-new_surface := fn(width: int, height: int): Surface {
-	return .(
-		@inline(memory.alloc, Color, width * height),
-		width,
-		height,
-	)
-}
-
-surface_from_ptr := fn(ptr: ^Color, width: int, height: int): Surface {
-	return .(
-		ptr,
-		width,
-		height,
-	)
-}
-
-clone_surface := fn(surface: ^Surface): Surface {
-	new := new_surface(surface.width, surface.height)
-	@inline(memory.copy, Color, surface.buf, new.buf, @intcast(surface.width * surface.height))
-	return new
-}
-
-free_surface := fn(surface: ^Surface): void {
-	// todo: depends on stn.memory.free
-	return
-}
-
 framebuffer := @as(^Color, idk)
 
-init := fn(doublebuffer: bool): Surface {
+init := fn(double_buffer: bool): Surface {
 	framebuffer = dt.get(^Color, "framebuffer/fb0/ptr\0")
 	width := dt.get(int, "framebuffer/fb0/width\0")
 	height := dt.get(int, "framebuffer/fb0/height\0")
-	if doublebuffer {
+	if double_buffer {
 		return new_surface(width, height)
 	} else {
 		return .(framebuffer, width, height)
@@ -56,22 +23,18 @@ sync := fn(surface: Surface): void {
 	return @inline(memory.copy, Color, surface.buf, framebuffer, @bitcast(surface.width * surface.height))
 }
 
-index := fn(surface: Surface, x: int, y: int): int {
+surfaceidx := fn(surface: Surface, x: int, y: int): ^Color {
-	return x + surface.width * y
+	return surface.buf + x + surface.width * y
-}
-
-indexptr := fn(surface: Surface, x: int, y: int): ^Color {
-	return surface.buf + @inline(index, surface, x, y)
 }
 
 put_pixel := fn(surface: Surface, pos: Vec2(int), color: Color): void {
-	*@inline(indexptr, surface, pos.x, pos.y) = color
+	*@inline(surfaceidx, surface, pos.x, pos.y) = color
 	return
 }
 
 put_filled_rect := fn(surface: Surface, pos: Vec2(int), tr: Vec2(int), color: Color): void {
-	top_start_idx := @inline(indexptr, surface, pos.x, pos.y)
+	top_start_idx := @inline(surfaceidx, surface, pos.x, pos.y)
-	bottom_start_idx := @inline(indexptr, surface, pos.x, pos.y + tr.y - 1)
+	bottom_start_idx := @inline(surfaceidx, surface, pos.x, pos.y + tr.y - 1)
 	rows_to_fill := tr.y
 
 	loop if rows_to_fill <= 1 break else {
@@ -91,9 +54,9 @@ put_filled_rect := fn(surface: Surface, pos: Vec2(int), tr: Vec2(int), color: Co
 }
 
 put_rect := fn(surface: Surface, pos: Vec2(int), tr: Vec2(int), color: Color): void {
-	start_idx := @inline(indexptr, surface, pos.x, pos.y)
+	start_idx := @inline(surfaceidx, surface, pos.x, pos.y)
-	end_idx := @inline(indexptr, surface, pos.x, pos.y + tr.y)
+	end_idx := @inline(surfaceidx, surface, pos.x, pos.y + tr.y)
-	right_start_idx := @inline(indexptr, surface, pos.x + tr.x, pos.y)
+	right_start_idx := @inline(surfaceidx, surface, pos.x + tr.x, pos.y)
 
 	loop if start_idx > end_idx break else {
 		*start_idx = color;
@@ -102,8 +65,8 @@ put_rect := fn(surface: Surface, pos: Vec2(int), tr: Vec2(int), color: Color): v
 		right_start_idx += surface.width
 	}
 
-	@inline(memory.set, Color, &color, @inline(indexptr, surface, pos.x, pos.y), @bitcast(tr.x + 1))
+	@inline(memory.set, Color, &color, @inline(surfaceidx, surface, pos.x, pos.y), @bitcast(tr.x + 1))
-	@inline(memory.set, Color, &color, @inline(indexptr, surface, pos.x, pos.y + tr.y), @bitcast(tr.x + 1))
+	@inline(memory.set, Color, &color, @inline(surfaceidx, surface, pos.x, pos.y + tr.y), @bitcast(tr.x + 1))
 
 	return
 }
@@ -120,7 +83,7 @@ put_line_low := fn(surface: Surface, p0: Vec2(int), p1: Vec2(int), color: Color)
 	y := p0.y
 	x := p0.x
 	loop if x == p1.x break else {
-		*@inline(indexptr, surface, x, y) = color
+		*@inline(surfaceidx, surface, x, y) = color
 		if D > 0 {
 			y += yi
 			D += 2 * (dy - dx)
@@ -144,7 +107,7 @@ put_line_high := fn(surface: Surface, p0: Vec2(int), p1: Vec2(int), color: Color
 	x := p0.x
 	y := p0.y
 	loop if y == p1.y break else {
-		*@inline(indexptr, surface, x, y) = color
+		*@inline(surfaceidx, surface, x, y) = color
 		if D > 0 {
 			x += xi
 			D += 2 * (dx - dy)
@@ -173,21 +136,16 @@ put_line := fn(surface: Surface, p0: Vec2(int), p1: Vec2(int), color: Color): vo
 	return
 }
 
-put_surface := fn(surface: Surface, top: Surface, pos: Vec2(int), flip_v: bool): void {
+put_surface := fn(surface: Surface, top: Surface, pos: Vec2(int)): void {
-	top_start_idx := @inline(indexptr, surface, pos.x, pos.y)
+	top_start_idx := @inline(surfaceidx, surface, pos.x, pos.y)
-	bottom_start_idx := @inline(indexptr, surface, pos.x, pos.y + top.height - 1)
+	bottom_start_idx := @inline(surfaceidx, surface, pos.x, pos.y + top.height - 1)
 	rows_to_copy := top.height
 	top_cursor := top.buf
 	bottom_cursor := top.buf + top.width * (top.height - 1)
 
 	loop if rows_to_copy <= 1 break else {
-		if flip_v {
-			@inline(memory.copy, Color, top_cursor, bottom_start_idx, @bitcast(top.width))
-			@inline(memory.copy, Color, bottom_cursor, top_start_idx, @bitcast(top.width))
-		} else {
 		@inline(memory.copy, Color, top_cursor, top_start_idx, @bitcast(top.width))
 		@inline(memory.copy, Color, bottom_cursor, bottom_start_idx, @bitcast(top.width))
-		}
 
 		top_start_idx += surface.width
 		bottom_start_idx -= surface.width
@@ -288,7 +246,7 @@ put_trirect := fn(surface: Surface, pos: Vec2(int), size: Vec2(int), color0: Col
 	target := pos + size
 
 	loop if pos.x == target.x break else {
-		@inline(put_vline, surface, pos.x, pos.y, target.y, color0)
+		put_vline(surface, pos.x, pos.y, target.y, color0)
 		@inline(put_vline, surface, pos.x, pos.y, start_y, color1)
 		pos += step
 	}
@@ -306,7 +264,7 @@ put_vline := fn(surface: Surface, x: int, y0: int, y1: int, color: Color): void
 	y := y0
 
 	loop if y == y1 break else {
-		*@inline(indexptr, surface, x, y) = color
+		*@inline(surfaceidx, surface, x, y) = color
 		y += 1
 	}
 
@@ -320,7 +278,12 @@ put_hline := fn(surface: Surface, y: int, x0: int, x1: int, color: Color): void
 		x0 = x1
 		x1 = tmp
 	}
-	@inline(memory.set, Color, &color, @inline(indexptr, surface, x0, y), @bitcast(x1 - x0 - 1))
+	x := x0
+
+	loop if x == x1 break else {
+		*@inline(surfaceidx, surface, x, y) = color
+		x += 1
+	}
 
 	return
 }

sysdata/libraries/stn/src/log.hb

@@ -1,14 +1,15 @@
 string := @use("string.hb")
+buffer := @use("buffer.hb")
 
-log := fn($Level: u8, message: ^u8): void {
+log := fn(message: ^u8, level: u8): void {
 	message_length := @inline(string.length, message);
-	*(message + message_length) = Level
+	*(message + message_length) = level
 
 	return @eca(3, 1, message, message_length + 1)
 }
 
-error := fn(message: ^u8): void return @inline(log, 0, message)
+error := fn(message: ^u8): void return log(message, 0)
-warn := fn(message: ^u8): void return @inline(log, 1, message)
+warn := fn(message: ^u8): void return log(message, 1)
-info := fn(message: ^u8): void return @inline(log, 2, message)
+info := fn(message: ^u8): void return log(message, 2)
-debug := fn(message: ^u8): void return @inline(log, 3, message)
+debug := fn(message: ^u8): void return log(message, 3)
-trace := fn(message: ^u8): void return @inline(log, 4, message)
+trace := fn(message: ^u8): void return log(message, 4)

sysdata/libraries/stn/src/math.hb

@@ -10,46 +10,7 @@ max := fn($Expr: type, a: Expr, b: Expr): Expr {
 	c := a - b
 	return a - (c & c >> @intcast(@sizeof(Expr) - 1))
 }
-signum := fn($Expr: type, x: Expr): int {
-	if x > @as(Expr, @intcast(0)) {
-		return 1
-	} else if x < @as(Expr, @intcast(0)) {
-		return -1
-	} else {
-		return 0
-	}
-}
-signincl := fn($Expr: type, x: Expr): int {
-	if x > @as(Expr, @intcast(0)) {
-		return 1
-	}
-	return -1
-}
 
 Vec2 := fn($Expr: type): type {
 	return struct {x: Expr, y: Expr}
 }
-
-SIN_TABLE := [int].(0, 174, 348, 523, 697, 871, 1045, 1218, 1391, 1564, 1736, 1908, 2079, 2249, 2419, 2588, 2756, 2923, 3090, 3255, 3420, 3583, 3746, 3907, 4067, 4226, 4384, 4540, 4695, 4848, 5000, 5150, 5299, 5446, 5591, 5735, 5877, 6018, 6156, 6293, 6427, 6560, 6691, 6819, 6946, 7071, 7193, 7313, 7431, 7547, 7660, 7771, 7880, 7986, 8090, 8191, 8290, 8386, 8480, 8571, 8660, 8746, 8829, 8910, 8987, 9063, 9135, 9205, 9271, 9335, 9396, 9455, 9510, 9563, 9612, 9659, 9702, 9743, 9781, 9816, 9848, 9877, 9902, 9925, 9945, 9961, 9975, 9986, 9993, 9998, 10000)
-
-sin_i := fn(theta_deg: int, amplitude: int): int {
-	theta := theta_deg % 360
-	if theta < 0 {
-		theta += 360
-	}
-
-	quadrant := theta / 90
-	theta = theta % 90
-
-	sign := 1 - ((quadrant & 2) >> 1) * 2
-	complement := quadrant & 1
-
-	index := theta * (1 - complement) + (90 - theta) * complement
-	sin_value := SIN_TABLE[index] * sign
-
-	return (sin_value * amplitude + 5000) / 10000
-}
-
-cos_i := fn(theta_deg: int, amplitude: int): int {
-	return @inline(sin_i, theta_deg + 90, amplitude)
-}

sysdata/libraries/stn/src/memory.hb

@@ -1,8 +1,8 @@
 PAGE_SIZE := 4096
 MAX_ALLOC := 0xFF
 
-alloc := fn($Expr: type, num: int): ^Expr {
+alloc := fn($Expr: type, bytes: int): ^Expr {
-	pages := 1 + @bitcast(@sizeof(Expr)) * num / PAGE_SIZE
+	pages := 1 + bytes / PAGE_SIZE
 	if pages <= MAX_ALLOC {
 		return @bitcast(@inline(request_page, pages))
 	}
@@ -19,11 +19,6 @@ alloc := fn($Expr: type, num: int): ^Expr {
 	return @bitcast(ptr)
 }
 
-free := fn($Expr: type, ptr: ^Expr, num: int): void {
-	// todo
-	return
-}
-
 request_page := fn(page_count: u8): ^u8 {
 	msg := "\{00}\{01}xxxxxxxx\0"
 	msg_page_count := msg + 1;

sysdata/programs/horizon/src/main.hb

@@ -1,5 +1,5 @@
 stn := @use("../../../libraries/stn/src/lib.hb");
-.{string, memory, buffer, random, log} := stn;
+.{string, memory, buffer, random} := stn;
 .{Vec2} := stn.math
 
 horizon_api := @use("../../../libraries/horizon_api/src/lib.hb")
@@ -16,7 +16,7 @@ Window := struct {
 }
 
 main := fn(): int {
-	win_buff := buffer.create("XHorizon\0")
+	a := buffer.create("XHorizon\0")
 
 	// BUG: Backbuffering is disabled
 	screen := render.init(true)
@@ -26,60 +26,24 @@ main := fn(): int {
 
 	window := render.new_surface(screen.width / 3, screen.height / 3)
 
-	x := 10
+	pos := Vec2(int).(100, 100)
 
-	mem_buf := memory.request_page(1)
 	color := random.range(render.Color, render.black, render.white)
-	side := window.width / 8
-
-	vel_inner := Vec2(int).(1, 1)
-	pos_inner := Vec2(int).((window.width - side) / 2, (window.height - side) / 2)
 
 	loop {
 		// Clear the screen
 		render.clear(screen, render.black)
 
 		// TODO: Read the window buffer here
-		{
-			ret := buffer.recv(win_buff, mem_buf, 4096)
-			if ret == 0 {
-				log.info("No messages\0")
-			}
-		}
-
-		if pos_inner.x == 0 | pos_inner.x == window.width - side {
-			vel_inner.x = -vel_inner.x
-			color = random.range(render.Color, render.black, render.white)
-		}
-		if pos_inner.y == 0 | pos_inner.y == window.height - side {
-			vel_inner.y = -vel_inner.y
-			color = random.range(render.Color, render.black, render.white)
-		}
 
 		// TODO: Get windows out of a collection and iter through
-		window_count := 0
+		//
-		loop {
-			render.clear(window, render.black)
-
-			// Draw the decorators
 		{
-				render.put_rect(window, .(0, 0), .(window.width - 1, window.height - 1), render.white)
+			render.clear(window, render.white)
-				// render.put_rect(window, .(0, 0), .(window.width - 1, 20), render.white)
-			}
-			render.put_filled_rect(window, pos_inner, .(side, side), color)
 
 			// Apply the image to the screen
-			pos := Vec2(int).(x, 100)
+			render.put_surface(screen, window, pos)
-
-			render.put_surface(screen, window, pos, false)
-			if window_count >= 1 {
-				x = 10
-				break
 		}
-			window_count += 1
-			x += 400
-		}
-		pos_inner += vel_inner
 
 		// Sync the screen
 		render.sync(screen)

sysdata/programs/horizon_testing_program/src/main.hb

@@ -8,33 +8,28 @@ ignim := @use("../../../libraries/ignim/src/lib.hb");
 .{errors} := ignim
 
 main := fn(): int {
-	x := 0
-	// loop if x > 10000 break else x += 1
-
 	windowing_system_buffer := buffer.search("XHorizon\0")
+
 	// TODO: get WindowID
-	wid := create_window(windowing_system_buffer)
+	create_window(windowing_system_buffer)
-	if false {
-		program_name := "Horizon Testing Program\0"
-		program_version := ignim.version.make_version(0, 1, 0)
-		engine_name := "None\0"
-		engine_version := ignim.version.make_version(0, 0, 0)
-		api_version := ignim.version.make_api_version(0, 1, 0, 0)
 
-		app_info := ignim.application.new_application_info(program_name, program_version, engine_name, engine_version, api_version)
+	// program_name := "Horizon Testing Program\0"
+	// program_version := ignim.version.make_version(0, 1, 0)
+	// engine_name := "None\0"
+	// engine_version := ignim.version.make_version(0, 0, 0)
+	// api_version := ignim.version.make_api_version(0, 1, 0, 0)
 
-		create_info := ignim.instance.new_create_info(&app_info)
+	// app_info := ignim.application.new_application_info(program_name, program_version, engine_name, engine_version, api_version)
 
-		instance := ignim.instance.void_instance()
+	// create_info := ignim.instance.new_create_info(&app_info)
+
+	// instance := ignim.instance.void_instance()
 
 	// // TODO: recursively follow this https://vulkan-tutorial.com/Drawing_a_triangle/Setup/Instance
-		ret := ignim.instance.create_instance(&create_info, 0, &instance)
+	// ret := ignim.instance.create_instance(&create_info, 0, &instance)
-		if ret == errors.IncompatibleDriver {
+	// if ret == errors.IncompatibleDriver {
-			log.error("Driver Incompatible with Vulkan\0")
+	// 	log.error("Driver Incompatible with Vulkan\0")
-		}
+	// }
-	}
-
-	// TODO: get window from the window system and draw to the surface
 
 	return 0
 }

sysdata/programs/render_example/src/examples/image.hb

@@ -8,27 +8,27 @@ bmp_1 := @embed("./assets/able.bmp")
 bmp_2 := @embed("./assets/mini.bmp")
 
 example := fn(): void {
+	screen := render.init(true)
 	images := [render.Surface; 2].(
 		render.image.surface_from_bmp(@bitcast(&bmp_1)),
 		render.image.surface_from_bmp(@bitcast(&bmp_2)),
 	)
-	screen := render.init(true)
 	vel := Vec2(int).(1, 1)
 	pos := Vec2(int).(100, 100)
-	n := 0
+	n := -1
 	loop {
 		image := images[n]
-		render.put_surface(screen, image, pos, false)
+		render.put_surface(screen, image, pos)
 		render.sync(screen)
 		render.clear(screen, render.black)
 
 		if pos.x == 0 | pos.x == screen.width - image.width {
 			vel.x = -vel.x
-			n = 1 - n
+			n = -1 - n
 		}
 		if pos.y == 0 | pos.y == screen.height - image.height {
 			vel.y = -vel.y
-			n = 1 - n
+			n = -1 - n
 		}
 
 		pos += vel

sysdata/programs/render_example/src/examples/surface.hb

@@ -14,28 +14,24 @@ example := fn(): void {
 	side := image.width / 8
 	vel_inner := Vec2(int).(1, 1)
 	pos_inner := Vec2(int).((image.width - side) / 2, (image.height - side) / 2)
-	// workaround for compiler bug
+	color := random.range(render.Color, render.black, render.white)
-	color := render.Color.(0, 0, 0, 0)
-	color = random.range(render.Color, render.black, render.white)
-	target_color := color
 	loop {
+		render.clear(image, render.black)
 		render.clear(screen, render.black)
-		// color += .(1, 1, 1, 1)
-		render.put_filled_rect(image, pos_inner, .(side, side), color)
-		render.put_rect(image, pos_inner, .(side, side), render.black)
-		render.put_rect(image, .(0, 0), .(image.width - 1, image.height - 1), color)
 
-		render.put_surface(screen, image, pos, false)
+		render.put_filled_rect(image, pos_inner, .(side, side), color)
-		render.put_rect(image, pos_inner, .(side, side), color)
+		render.put_rect(image, .(0, 0), .(image.width - 1, image.height - 1), render.white)
+
+		render.put_surface(screen, image, pos)
 		render.sync(screen)
 
 		if pos_inner.x == 0 | pos_inner.x == image.width - side {
 			vel_inner.x = -vel_inner.x
-			target_color = random.range(render.Color, render.black, render.white)
+			color = random.range(render.Color, render.black, render.white)
 		}
 		if pos_inner.y == 0 | pos_inner.y == image.height - side {
 			vel_inner.y = -vel_inner.y
-			target_color = random.range(render.Color, render.black, render.white)
+			color = random.range(render.Color, render.black, render.white)
 		}
 
 		if pos.x == 0 | pos.x == screen.width - image.width {
@@ -45,12 +41,6 @@ example := fn(): void {
 			vel.y = -vel.y
 		}
 
-		color += .(
-			@intcast(color.b < target_color.b) - @intcast(color.b > target_color.b),
-			@intcast(color.g < target_color.g) - @intcast(color.g > target_color.g),
-			@intcast(color.r < target_color.r) - @intcast(color.r > target_color.r),
-			0,
-		)
 		pos += vel
 		pos_inner += vel_inner
 	}

sysdata/programs/tests/src/main.hb

@@ -20,11 +20,5 @@ main := fn(): int {
 	//}
 	beep()
 	//service_search()
-	buf := "\0\0\0\0"
-	x := 0
-	loop if x == 255 break else {
-		log.info(string.display_int(x, buf))
-		x += 1
-	}
 	return 0
 }