From e3f7a2d45503988784cdea9026f5dce64593f581 Mon Sep 17 00:00:00 2001 From: koniifer Date: Mon, 2 Sep 2024 04:36:03 +0100 Subject: [PATCH] inline fb_driver, update to latest hblang --- Cargo.lock | 10 +++--- sysdata/libraries/stn/src/buffer.hb | 6 ++-- sysdata/libraries/stn/src/log.hb | 2 +- sysdata/libraries/stn/src/string.hb | 33 ++++++------------- sysdata/programs/diskio_driver/src/main.hb | 3 +- sysdata/programs/fb_driver/src/draw.hb | 30 ++++++++--------- .../fb_driver/src/examples/buffers.hb | 19 +++++++++++ .../fb_driver/src/examples/front_buffer.hb | 19 ----------- .../programs/fb_driver/src/examples/random.hb | 17 ++++++++++ sysdata/programs/fb_driver/src/lib.hb | 31 +++++++---------- sysdata/programs/fb_driver/src/main.hb | 4 +-- .../programs/serial_driver_test/src/main.hb | 2 +- 12 files changed, 85 insertions(+), 91 deletions(-) create mode 100644 sysdata/programs/fb_driver/src/examples/buffers.hb delete mode 100644 sysdata/programs/fb_driver/src/examples/front_buffer.hb create mode 100644 sysdata/programs/fb_driver/src/examples/random.hb diff --git a/Cargo.lock b/Cargo.lock index 5bfd9b7..0e74d59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -444,17 +444,17 @@ dependencies = [ [[package]] name = "hbbytecode" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#641be15703153386fef1a6b083a7e00c85414df9" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f172c332478f54839ea8b3814883ffa7ac29b5b1" [[package]] name = "hbbytecode" version = "0.1.0" -source = "git+https://git.ablecorp.us/ableos/holey-bytes#641be15703153386fef1a6b083a7e00c85414df9" +source = "git+https://git.ablecorp.us/ableos/holey-bytes#f172c332478f54839ea8b3814883ffa7ac29b5b1" [[package]] name = "hblang" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#641be15703153386fef1a6b083a7e00c85414df9" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f172c332478f54839ea8b3814883ffa7ac29b5b1" dependencies = [ "hbvm 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", ] @@ -462,7 +462,7 @@ dependencies = [ [[package]] name = "hbvm" version = "0.1.0" -source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#641be15703153386fef1a6b083a7e00c85414df9" +source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#f172c332478f54839ea8b3814883ffa7ac29b5b1" dependencies = [ "hbbytecode 0.1.0 (git+https://git.ablecorp.us/AbleOS/holey-bytes.git)", ] @@ -470,7 +470,7 @@ dependencies = [ [[package]] name = "hbvm" version = "0.1.0" -source = "git+https://git.ablecorp.us/ableos/holey-bytes#641be15703153386fef1a6b083a7e00c85414df9" +source = "git+https://git.ablecorp.us/ableos/holey-bytes#f172c332478f54839ea8b3814883ffa7ac29b5b1" dependencies = [ "hbbytecode 0.1.0 (git+https://git.ablecorp.us/ableos/holey-bytes)", ] diff --git a/sysdata/libraries/stn/src/buffer.hb b/sysdata/libraries/stn/src/buffer.hb index fd8b0aa..ef5bf71 100644 --- a/sysdata/libraries/stn/src/buffer.hb +++ b/sysdata/libraries/stn/src/buffer.hb @@ -5,19 +5,19 @@ receive_message := fn(buffer_id: int, memory_map_location: ^u8, length: int): ^u } send_message := fn(msg: ^u8, buffer_id: int): void { - msg_length := string.length(msg) + msg_length := @inline(string.length, msg) @eca(i32, 3, buffer_id, msg, msg_length) return } create := fn(msg: ^u8): int { - msg_length := string.length(msg); + msg_length := @inline(string.length, msg); *msg = 0 return @eca(int, 3, 0, msg, msg_length) } search := fn(msg: ^u8): int { - msg_length := string.length(msg); + msg_length := @inline(string.length, msg); *msg = 3 return @eca(int, 3, 0, msg, msg_length) diff --git a/sysdata/libraries/stn/src/log.hb b/sysdata/libraries/stn/src/log.hb index 42cf4a6..d643d76 100644 --- a/sysdata/libraries/stn/src/log.hb +++ b/sysdata/libraries/stn/src/log.hb @@ -2,7 +2,7 @@ string := @use("rel:string.hb") buffer := @use("rel:buffer.hb") log := fn(message: ^u8, level: u8): void { - message_length := string.length(message); + message_length := @inline(string.length, message); *(message + message_length) = level @eca(i32, 3, 1, message, message_length + 1) return diff --git a/sysdata/libraries/stn/src/string.hb b/sysdata/libraries/stn/src/string.hb index 260b03a..e4ba668 100644 --- a/sysdata/libraries/stn/src/string.hb +++ b/sysdata/libraries/stn/src/string.hb @@ -1,51 +1,38 @@ length := fn(ptr: ^u8): int { len := 0 - loop if *ptr == 0 break else { - len += 1 - ptr += 1 - } + loop if *(ptr + len) == 0 break else len += 1 return len } display_int := fn(num: int, p: ^u8): ^u8 { i := 0 if num == 0 { - set(p, 48) + *p = 48 return p } - loop { - if num == 0 break - set(p + i, num % 10 + 48) + loop if num == 0 break else { + *(p + i) = num % 10 + 48 num /= 10 i += 1 } - reverse(p) - //null terminate - set(p + i, 0) + @inline(reverse, p); + *(p + i) = 0 return p } reverse := fn(s: ^u8): void { //reverse a string, don't remove digits len := 0 - loop { - if *(s + len) == 0 break - len += 1 - } + loop if *(s + len) == 0 break else len += 1 i := 0 j := len - 1 - loop { - if i >= j break - temp := *(s + i); + temp := 0 + loop if i >= j break else { + temp = *(s + i); *(s + i) = *(s + j); *(s + j) = temp i += 1 j -= 1 } return -} - -set := fn(change: ^u8, new: int): void { - *change = new - return } \ No newline at end of file diff --git a/sysdata/programs/diskio_driver/src/main.hb b/sysdata/programs/diskio_driver/src/main.hb index dd0ddf2..1800402 100644 --- a/sysdata/programs/diskio_driver/src/main.hb +++ b/sysdata/programs/diskio_driver/src/main.hb @@ -1,5 +1,4 @@ -stn := @use("../../../libraries/stn/src/lib.hb"); -.{log, string, memory, buffer} := stn +.{memory, buffer} := @use("../../../libraries/stn/src/lib.hb") main := fn(): int { // shuts down ableOS diff --git a/sysdata/programs/fb_driver/src/draw.hb b/sysdata/programs/fb_driver/src/draw.hb index 9faf24a..089dc38 100644 --- a/sysdata/programs/fb_driver/src/draw.hb +++ b/sysdata/programs/fb_driver/src/draw.hb @@ -1,13 +1,13 @@ -.{draw_pixel, screenidx, Transform, Point, Rect, Buffer, FB_WIDTH} := @use("rel:lib.hb") -ColorBGRA := @use("rel:color.hb").ColorBGRA -math := @use("../../../libraries/stn/src/lib.hb").math +.{draw_pixel, screenidx, Transform, Point, Rect, Buffer, FB_WIDTH} := @use("rel:lib.hb"); +.{math} := @use("../../../libraries/stn/src/lib.hb"); +.{ColorBGRA} := @use("rel:color.hb") /* draws a filled rectangle to the screen will be optimised later */ rect_fill := fn(buffer: Buffer, pos: Point, tr: Transform, color: ColorBGRA): void { n := 0 loop if n == tr.height * tr.width break else { - *(buffer.write + screenidx(.(n % tr.width + pos.x, n / tr.width + pos.y))) = color + *(buffer.write + @inline(screenidx, .(n % tr.width + pos.x, n / tr.width + pos.y))) = color n += 1 } return @@ -22,13 +22,13 @@ rect_line := fn(buffer: Buffer, pos: Point, tr: Transform, color: ColorBGRA, thi y = pos.y x = pos.x loop if y == pos.y + tr.height break else { - *(buffer.write + pos.x + t + FB_WIDTH * y) = color; - *(buffer.write + pos.x + tr.width - t + FB_WIDTH * y) = color + *(buffer.write + @inline(screenidx, .(pos.x + t, y))) = color; + *(buffer.write + @inline(screenidx, .(pos.x + tr.width - t, y))) = color y += 1 } loop if x == pos.x + tr.width break else { - *(buffer.write + x + (pos.y + t) * FB_WIDTH) = color; - *(buffer.write + x + (pos.y + tr.height - t) * FB_WIDTH) = color + *(buffer.write + @inline(screenidx, .(x, pos.y + t))) = color; + *(buffer.write + @inline(screenidx, .(x, pos.y + tr.height - t))) = color x += 1 } t += 1 @@ -49,7 +49,7 @@ line_low := fn(buffer: Buffer, p0: Point, p1: Point, color: ColorBGRA): void { y := p0.y x := p0.x loop if x == p1.x break else { - *(buffer.write + x + y * FB_WIDTH) = color + *(buffer.write + @inline(screenidx, .(x, y))) = color if D > 0 { y += yi D += 2 * (dy - dx) @@ -73,7 +73,7 @@ line_high := fn(buffer: Buffer, p0: Point, p1: Point, color: ColorBGRA): void { x := p0.x y := p0.y loop if y == p1.y break else { - *(buffer.write + x + y * FB_WIDTH) = color + *(buffer.write + @inline(screenidx, .(x, y))) = color if D > 0 { x += xi D += 2 * (dx - dy) @@ -88,17 +88,17 @@ line_high := fn(buffer: Buffer, p0: Point, p1: Point, color: ColorBGRA): void { /* implementation of Bresenham's line algorithm TODO: thickness, might need better math library */ line := fn(buffer: Buffer, p0: Point, p1: Point, color: ColorBGRA, thickness: int): void { - if math.abs(p1.y - p0.y) < math.abs(p1.x - p0.x) { + if @inline(math.abs, p1.y - p0.y) < @inline(math.abs, p1.x - p0.x) { if p0.x > p1.x { - line_low(buffer, p1, p0, color) + @inline(line_low, buffer, p1, p0, color) } else { - line_low(buffer, p0, p1, color) + @inline(line_low, buffer, p0, p1, color) } } else { if p0.y > p1.y { - line_high(buffer, p1, p0, color) + @inline(line_high, buffer, p1, p0, color) } else { - line_high(buffer, p0, p1, color) + @inline(line_high, buffer, p0, p1, color) } } return diff --git a/sysdata/programs/fb_driver/src/examples/buffers.hb b/sysdata/programs/fb_driver/src/examples/buffers.hb new file mode 100644 index 0000000..4157408 --- /dev/null +++ b/sysdata/programs/fb_driver/src/examples/buffers.hb @@ -0,0 +1,19 @@ +.{front_buffer_ptr, front_buffer_copy, get_front_buffer, Buffer} := @use("../lib.hb"); + +example := fn(): void { + // you can get the raw frontbuffer pointer using + raw_buffer := front_buffer_ptr + // this buffer is the one that you write individual pixels to + + // you can gete the copy frontbuffer pointer using + copy_buffer := front_buffer_copy + /* this buffer is used for massive writing + operations by taking advantage of + static copying */ + + // you can construct a buffer like so + buffer := Buffer.{write: raw_buffer, copy: copy_buffer} + // this is the operation that get_front_buffer does + same_buffer := get_front_buffer() + return +} \ No newline at end of file diff --git a/sysdata/programs/fb_driver/src/examples/front_buffer.hb b/sysdata/programs/fb_driver/src/examples/front_buffer.hb deleted file mode 100644 index 8c1bf5a..0000000 --- a/sysdata/programs/fb_driver/src/examples/front_buffer.hb +++ /dev/null @@ -1,19 +0,0 @@ -.{front_buffer_ptr, front_buffer_copy, get_front_buffer, Buffer} := @use("../lib.hb"); - -example := fn(): void { - // you can get the raw frontbuffer pointer using - raw_buffer := front_buffer_ptr - // this buffer is the one that you write individual pixels to - - // you can gete the copy frontbuffer pointer using - copy_buffer := copy_buffer_ptr - /* this buffer is used for massive writing - operations by taking advantage of - static copying */ - - // you can construct a buffer like so - buffer := Buffer.{write: raw_buffer, copy: copy_buffer} - // this is the operation that get_front_buffer does - same_buffer := get_front_buffer() - return -} \ No newline at end of file diff --git a/sysdata/programs/fb_driver/src/examples/random.hb b/sysdata/programs/fb_driver/src/examples/random.hb new file mode 100644 index 0000000..75ecb81 --- /dev/null +++ b/sysdata/programs/fb_driver/src/examples/random.hb @@ -0,0 +1,17 @@ +.{clear, get_front_buffer, screenidx} := @use("../lib.hb"); +.{ColorBGRA} := @use("../color.hb"); +.{random} := @use("../../../../libraries/stn/src/lib.hb") + +example := fn(): void { + buffer := get_front_buffer() + clear(buffer) + loop { + x := random.integer(0, 1024) + y := random.integer(0, 768) + r := random.integer(0, 255) + g := random.integer(0, 75) + b := random.integer(0, 155); + *(buffer.write + @inline(screenidx, .(x, y))) = ColorBGRA.(b, g, r, 255) + } + return +} \ No newline at end of file diff --git a/sysdata/programs/fb_driver/src/lib.hb b/sysdata/programs/fb_driver/src/lib.hb index 02c88c5..ca91a63 100644 --- a/sysdata/programs/fb_driver/src/lib.hb +++ b/sysdata/programs/fb_driver/src/lib.hb @@ -1,4 +1,4 @@ -.{memory, log, math} := @use("../../../libraries/stn/src/lib.hb"); +.{memory, math} := @use("../../../libraries/stn/src/lib.hb"); .{ColorBGRA, blend} := @use("rel:color.hb") FB_WIDTH := 1024 @@ -14,29 +14,27 @@ TOTAL_PAGES := 1 + FB_BYTES >> 12 Buffer := struct {write: ^ColorBGRA, copy: ^[ColorBGRA; COPY_PIXELS]} Point := struct {x: int, y: int} Transform := struct {width: int, height: int} -Rect := struct {p1: Point, p2: Point} front_buffer_ptr := @as(^ColorBGRA, @bitcast(0xFFFF8000C0000000)) front_buffer_copy := @as(^[ColorBGRA; COPY_PIXELS], @bitcast(front_buffer_ptr)) get_front_buffer := fn(): Buffer { // trying to return front_buffer_ptr or front_buffer_copy causes reg id leak - return Buffer.{write: @as(^ColorBGRA, @bitcast(0xFFFF8000C0000000)), copy: @as(^[ColorBGRA; COPY_PIXELS], @bitcast(0xFFFF8000C0000000))} + buffer := Buffer.{write: front_buffer_ptr, copy: front_buffer_copy} + return buffer } /* this is separate to create_raw_buffer because returning a Buffer from create_raw_buffer causes reg id leak */ create_buffer := fn(): Buffer { - ptr := create_raw_buffer() - ptr_copy := @as(^[ColorBGRA; COPY_PIXELS], @bitcast(ptr)) - // same here, bitcasting inside the struct literal causes reg id leak - buffer := Buffer.{write: ptr, copy: ptr_copy} + ptr := @inline(create_raw_buffer) + buffer := Buffer.{write: ptr, copy: @as(^[ColorBGRA; COPY_PIXELS], @bitcast(ptr))} return buffer } create_raw_buffer := fn(): ^ColorBGRA { if TOTAL_PAGES <= 0xFF { - return @bitcast(memory.request_page(TOTAL_PAGES)) + return @bitcast(@inline(memory.request_page, TOTAL_PAGES)) } - ptr := memory.request_page(255) + ptr := @inline(memory.request_page, 255) remaining := TOTAL_PAGES - 0xFF loop if remaining <= 0 break else { if remaining < 0xFF { @@ -66,11 +64,11 @@ clear := fn(buffer: Buffer, color: ColorBGRA): void { } // only required to be called when using a back buffer. if using single-buffered rendering, do not call this. present := fn(buffer: Buffer): void { - offset := 0 + n := 0 // copy chunks of the read buffer to the front buffer - loop if offset >= PARTITIONS break else { - *(front_buffer_copy + offset) = *(buffer.copy + offset) - offset += 1 + loop if n >= PARTITIONS break else { + *(front_buffer_copy + n) = *(buffer.copy + n) + n += 1 } return } @@ -85,13 +83,6 @@ composite := fn(buffer1: Buffer, buffer2: Buffer): void { } return } -// really need to be able to inline this please - aurlex screenidx := fn(pos: Point): int { return pos.x + FB_WIDTH * pos.y -} -point2rect := fn(pos: Point, tr: Transform): Rect { - return .(pos, .(pos.x + tr.x, pos.y + tr.y)) -} -rect2point := fn(rect: Rect): struct {point: Point, transform: Transform} { - return .(.(0, 0), .(0, 0)) } \ No newline at end of file diff --git a/sysdata/programs/fb_driver/src/main.hb b/sysdata/programs/fb_driver/src/main.hb index ab3726b..e1c71c2 100644 --- a/sysdata/programs/fb_driver/src/main.hb +++ b/sysdata/programs/fb_driver/src/main.hb @@ -1,6 +1,6 @@ -.{example} := @use("./examples/colors.hb") +.{example} := @use("./examples/lines.hb") main := fn(): int { - example() + @inline(example) return 0 } \ No newline at end of file diff --git a/sysdata/programs/serial_driver_test/src/main.hb b/sysdata/programs/serial_driver_test/src/main.hb index da3b881..a9af0fa 100644 --- a/sysdata/programs/serial_driver_test/src/main.hb +++ b/sysdata/programs/serial_driver_test/src/main.hb @@ -5,7 +5,7 @@ log_info := fn(): void { if a == 0 { } else { msg := "XABC\0" - msg_length := string.length(msg) + msg_length := @inline(string.length, msg) @eca(void, 3, a, msg, msg_length) }