Use address of Bytes instead of copying into a FixedArray[Byte]

Author: Kalle Fagerberg

src/ffi/top.wasm-gc.mbt

@@ -1,4 +1,23 @@
 ///|
-pub fn get_addr(_ : FixedArray[Byte]) -> UInt {
+/// Returns the WASM object address to a `FixedArray[Byte]` object.
+///
+/// > Warning: not implemented in `--target wasm-gc`. This function is only here
+/// > to make intellisense happy in code editors that don't understand we are
+/// > using `wasm` and not `wasm-gc`.
+/// >
+/// > This function does have an implementation for `--target wasm`.
+pub fn get_addr_fixedbytes(_ : FixedArray[Byte]) -> UInt {
+  panic() // unsupported on wasm-gc, but this function is here to satisfy my stupid editor
+}
+
+///|
+/// Returns the WASM object address to a `Bytes` object.
+///
+/// > Warning: not implemented in `--target wasm-gc`. This function is only here
+/// > to make intellisense happy in code editors that don't understand we are
+/// > using `wasm` and not `wasm-gc`.
+/// >
+/// > This function does have an implementation for `--target wasm`.
+pub fn get_addr_bytes(_ : Bytes) -> UInt {
   panic() // unsupported on wasm-gc, but this function is here to satisfy my stupid editor
 }

src/ffi/top.wasm.mbt

@@ -1,5 +1,15 @@
 ///|
+/// Returns the WASM object address to a `FixedArray[Byte]` object.
+#inline
 #borrow(bytes)
-pub extern "wasm" fn get_addr(bytes : FixedArray[Byte]) -> UInt =
+pub extern "wasm" fn addr_of_fixedbytes(bytes : FixedArray[Byte]) -> UInt =
+  #|(func (param i32) (result i32)
+  #|  (i32.add (local.get 0) (i32.const 8)))
+
+///|
+/// Returns the WASM object address to a `Bytes` object.
+#inline
+#borrow(bytes)
+pub extern "wasm" fn addr_of_bytes(bytes : Bytes) -> UInt =
   #|(func (param i32) (result i32)
   #|  (i32.add (local.get 0) (i32.const 8)))

src/fs.mbt

@@ -5,9 +5,9 @@
 ///
 /// Returns 0 if the file does not exist.
 pub fn get_file_size(path : String) -> UInt {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.get_file_size(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   ignore(path_arr)
@@ -30,9 +30,9 @@ pub fn is_file(path : String) -> Bool {
 ///
 /// Example: loading fonts, images, or save files.
 pub fn load_file(path : String) -> File? {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.get_file_size(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   match size {
@@ -43,9 +43,9 @@ pub fn load_file(path : String) -> File? {
         Byte::default(),
       )
       @ffi.load_file(
-        @ffi.get_addr(path_arr),
+        @ffi.addr_of_bytes(path_arr),
         path_arr.length().reinterpret_as_uint(),
-        @ffi.get_addr(file_arr),
+        @ffi.addr_of_fixedbytes(file_arr),
         file_arr.length().reinterpret_as_uint(),
       )
       |> ignore
@@ -63,11 +63,11 @@ pub fn load_file(path : String) -> File? {
 ///
 /// Example: loading fonts, images, or save files.
 pub fn load_file_to(path : String, output : FixedArray[Byte]) -> UInt {
-  let text_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let text_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.load_file(
-    @ffi.get_addr(text_arr),
+    @ffi.addr_of_bytes(text_arr),
     text_arr.length().reinterpret_as_uint(),
-    @ffi.get_addr(output),
+    @ffi.addr_of_fixedbytes(output),
     output.length().reinterpret_as_uint(),
   )
   ignore(text_arr)
@@ -125,11 +125,11 @@ pub fn load_file_to_image(path : String) -> Image? {
 ///
 /// Returns the number of bytes written.
 pub fn dump_file(path : String, file : File) -> UInt {
-  let text_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let text_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.load_file(
-    @ffi.get_addr(text_arr),
+    @ffi.addr_of_bytes(text_arr),
     text_arr.length().reinterpret_as_uint(),
-    @ffi.get_addr(file.inner()),
+    @ffi.addr_of_fixedbytes(file.inner()),
     file.get_size(),
   )
   ignore(text_arr)
@@ -207,9 +207,9 @@ pub fn dump_image_to_file(path : String, image : Image) -> UInt {
 ///
 /// Example: removing save files.
 pub fn remove_file(path : String) -> Unit {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   @ffi.remove_file(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   ignore(path_arr)

src/graphics.mbt

@@ -195,11 +195,11 @@ pub fn draw_text(
   point : Point,
   color : Color,
 ) -> Unit {
-  let text_arr = @encoding.encode(text, encoding=UTF8).to_fixedarray()
+  let text_arr = @encoding.encode(text, encoding=UTF8)
   @ffi.draw_text(
-    @ffi.get_addr(text_arr),
+    @ffi.addr_of_bytes(text_arr),
     text_arr.length().reinterpret_as_uint(),
-    @ffi.get_addr(font.inner()),
+    @ffi.addr_of_fixedbytes(font.inner()),
     font.inner().length().reinterpret_as_uint(),
     point.x,
     point.y,
@@ -216,9 +216,9 @@ pub fn draw_qr(
   black : Color,
   white : Color,
 ) -> Unit {
-  let text_arr = @encoding.encode(text, encoding=UTF8).to_fixedarray()
+  let text_arr = @encoding.encode(text, encoding=UTF8)
   @ffi.draw_qr(
-    @ffi.get_addr(text_arr),
+    @ffi.addr_of_bytes(text_arr),
     text_arr.length().reinterpret_as_uint(),
     point.x,
     point.y,
@@ -232,7 +232,7 @@ pub fn draw_qr(
 /// Render an image.
 pub fn draw_image(image : Image, point : Point) -> Unit {
   @ffi.draw_image(
-    @ffi.get_addr(image.inner()),
+    @ffi.addr_of_fixedbytes(image.inner()),
     image.inner().length().reinterpret_as_uint(),
     point.x,
     point.y,
@@ -250,7 +250,7 @@ pub fn draw_sub_image(
   sub_size : Size,
 ) -> Unit {
   @ffi.draw_sub_image(
-    @ffi.get_addr(image.inner()),
+    @ffi.addr_of_fixedbytes(image.inner()),
     image.inner().length().reinterpret_as_uint(),
     point.x,
     point.y,
@@ -273,7 +273,7 @@ let current_canvas : Ref[Canvas?] = Ref::new(None)
 pub fn set_canvas(canvas : Canvas) -> Unit {
   current_canvas.val = Some(canvas)
   @ffi.set_canvas(
-    @ffi.get_addr(canvas.inner()),
+    @ffi.addr_of_fixedbytes(canvas.inner()),
     canvas.inner().length().reinterpret_as_uint(),
   )
 }

src/misc.mbt

@@ -1,16 +1,16 @@
 ///|
 /// Log a debug message.
 pub fn log_debug(s : String) -> Unit {
-  let arr = @encoding.encode(s, encoding=UTF8).to_fixedarray()
-  @ffi.log_debug(@ffi.get_addr(arr), arr.length().reinterpret_as_uint())
+  let arr = @encoding.encode(s, encoding=UTF8)
+  @ffi.log_debug(@ffi.addr_of_bytes(arr), arr.length().reinterpret_as_uint())
   ignore(arr)
 }
 
 ///|
 /// Log an error message.
 pub fn log_error(s : String) -> Unit {
-  let arr = @encoding.encode(s, encoding=UTF8).to_fixedarray()
-  @ffi.log_error(@ffi.get_addr(arr), arr.length().reinterpret_as_uint())
+  let arr = @encoding.encode(s, encoding=UTF8)
+  @ffi.log_error(@ffi.addr_of_bytes(arr), arr.length().reinterpret_as_uint())
   ignore(arr)
 }
 
@@ -45,19 +45,21 @@ pub fn get_random() -> UInt {
 /// Get name of the device.
 pub fn get_name(peer : UInt) -> String {
   let arr = FixedArray::make(120, Byte::default())
-  let len = @ffi.get_name(peer, @ffi.get_addr(arr))
+  let len = @ffi.get_name(peer, @ffi.addr_of_fixedbytes(arr))
   let bytes = Bytes::from_fixedarray(arr, len=len.reinterpret_as_int())
   @encoding.decode_lossy(bytes[:])
 }
 
 ///|
 /// Restart the app after the current update is finished.
+#inline
 pub fn restart() -> Unit {
   @ffi.restart()
 }
 
 ///|
 /// Exit the app after the current update is finished.
+#inline
 pub fn quit() -> Unit {
   @ffi.quit()
 }

src/sudo/top.mbt

@@ -3,9 +3,9 @@
 ///
 /// NOTE: this requires that the app has sudo access.
 pub fn get_file_size(path : String) -> UInt {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.sudo_get_file_size(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   ignore(path_arr) // prevent it from getting cleaned up before here
@@ -17,9 +17,9 @@ pub fn get_file_size(path : String) -> UInt {
 ///
 /// NOTE: this requires that the app has sudo access.
 pub fn load_file(path : String) -> @firefly.File? {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.sudo_get_file_size(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   match size {
@@ -30,9 +30,9 @@ pub fn load_file(path : String) -> @firefly.File? {
         Byte::default(),
       )
       @ffi.sudo_load_file(
-        @ffi.get_addr(path_arr),
+        @ffi.addr_of_bytes(path_arr),
         path_arr.length().reinterpret_as_uint(),
-        @ffi.get_addr(file_arr),
+        @ffi.addr_of_fixedbytes(file_arr),
         file_arr.length().reinterpret_as_uint(),
       )
       |> ignore
@@ -61,9 +61,9 @@ pub fn load_file(path : String) -> @firefly.File? {
 ///
 /// NOTE: this requires that the app has sudo access.
 pub fn list_dirs(path : String) -> Array[String] {
-  let path_arr = @encoding.encode(path, encoding=UTF8).to_fixedarray()
+  let path_arr = @encoding.encode(path, encoding=UTF8)
   let size = @ffi.sudo_list_dirs_buf_size(
-    @ffi.get_addr(path_arr),
+    @ffi.addr_of_bytes(path_arr),
     path_arr.length().reinterpret_as_uint(),
   )
   match size {
@@ -74,9 +74,9 @@ pub fn list_dirs(path : String) -> Array[String] {
         Byte::default(),
       )
       let read_bytes = @ffi.sudo_list_dirs(
-        @ffi.get_addr(path_arr),
+        @ffi.addr_of_bytes(path_arr),
         path_arr.length().reinterpret_as_uint(),
-        @ffi.get_addr(dirs_buf),
+        @ffi.addr_of_fixedbytes(dirs_buf),
         dirs_buf.length().reinterpret_as_uint(),
       ).reinterpret_as_int()
       ignore(path_arr) // prevent it from getting cleaned up before here