From a3e07be4d1dcef0605b6735635488ce45d6d0a5f Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 23 Jun 2024 10:28:16 -0700
Subject: append helpers reference alloc, alloc only exists with the flag
 enabled

---
 src/display/display_sink.rs | 371 ++++++++++++++++++++++----------------------
 1 file changed, 187 insertions(+), 184 deletions(-)

diff --git a/src/display/display_sink.rs b/src/display/display_sink.rs
index 87f5609..6741a11 100644
--- a/src/display/display_sink.rs
+++ b/src/display/display_sink.rs
@@ -492,7 +492,7 @@ mod instruction_text_sink {
                 }
             }
             unsafe {
-                crate::display::display_sink::append_string_lt_32_unchecked(&mut self.buf, s);
+                super::append_helpers::append_string_lt_32_unchecked(&mut self.buf, s);
             }
 
             Ok(())
@@ -505,7 +505,7 @@ mod instruction_text_sink {
             }
 
             unsafe {
-                crate::display::display_sink::append_string_lt_16_unchecked(&mut self.buf, s);
+                super::append_helpers::append_string_lt_16_unchecked(&mut self.buf, s);
             }
 
             Ok(())
@@ -518,7 +518,7 @@ mod instruction_text_sink {
             }
 
             unsafe {
-                crate::display::display_sink::append_string_lt_8_unchecked(&mut self.buf, s);
+                super::append_helpers::append_string_lt_8_unchecked(&mut self.buf, s);
             }
 
             Ok(())
@@ -753,7 +753,7 @@ impl DisplaySink for alloc::string::String {
         self.reserve(s.len());
 
         unsafe {
-            append_string_lt_32_unchecked(self, s);
+            append_helpers::append_string_lt_32_unchecked(self, s);
         }
 
         Ok(())
@@ -762,7 +762,7 @@ impl DisplaySink for alloc::string::String {
         self.reserve(s.len());
 
         unsafe {
-            append_string_lt_16_unchecked(self, s);
+            append_helpers::append_string_lt_16_unchecked(self, s);
         }
 
         Ok(())
@@ -771,7 +771,7 @@ impl DisplaySink for alloc::string::String {
         self.reserve(s.len());
 
         unsafe {
-            append_string_lt_8_unchecked(self, s);
+            append_helpers::append_string_lt_8_unchecked(self, s);
         }
 
         Ok(())
@@ -934,190 +934,193 @@ impl DisplaySink for alloc::string::String {
     }
 }
 
-/// append `data` to `buf`, assuming `data` is less than 8 bytes and that `buf` has enough space
-/// remaining to hold all bytes in `data`.
-///
-/// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
-#[inline(always)]
-unsafe fn append_string_lt_8_unchecked(buf: &mut alloc::string::String, data: &str) {
-    // SAFETY: todo
-    let buf = unsafe { buf.as_mut_vec() };
-    let new_bytes = data.as_bytes();
-
-    // should get DCE
-    if new_bytes.len() >= 8 {
-        unsafe { core::hint::unreachable_unchecked() }
-    }
+#[cfg(feature="alloc")]
+mod append_helpers {
+    /// append `data` to `buf`, assuming `data` is less than 8 bytes and that `buf` has enough space
+    /// remaining to hold all bytes in `data`.
+    ///
+    /// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
+    #[inline(always)]
+    pub unsafe fn append_string_lt_8_unchecked(buf: &mut alloc::string::String, data: &str) {
+        // SAFETY: todo
+        let buf = unsafe { buf.as_mut_vec() };
+        let new_bytes = data.as_bytes();
+
+        // should get DCE
+        if new_bytes.len() >= 8 {
+            unsafe { core::hint::unreachable_unchecked() }
+        }
 
-    unsafe {
-        let dest = buf.as_mut_ptr().offset(buf.len() as isize);
-        let src = new_bytes.as_ptr();
-
-        let rem = new_bytes.len() as isize;
-
-        // set_len early because there is no way to avoid the following asm!() writing that
-        // same number of bytes into buf
-        buf.set_len(buf.len() + new_bytes.len());
-
-        core::arch::asm!(
-            "8:",
-            "cmp {rem:e}, 4",
-            "jb 9f",
-            "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
-            "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
-            "sub {rem:e}, 4",
-            "jz 11f",
-            "9:",
-            "cmp {rem:e}, 2",
-            "jb 10f",
-            "mov {buf:x}, word ptr [{src} + {rem} - 2]",
-            "mov word ptr [{dest} + {rem} - 2], {buf:x}",
-            "sub {rem:e}, 2",
-            "jz 11f",
-            "10:",
-            "cmp {rem:e}, 1",
-            "jb 11f",
-            "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
-            "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
-            "11:",
-            src = in(reg) src,
-            dest = in(reg) dest,
-            rem = inout(reg) rem => _,
-            buf = out(reg) _,
-            options(nostack),
-        );
-    }
-}
+        unsafe {
+            let dest = buf.as_mut_ptr().offset(buf.len() as isize);
+            let src = new_bytes.as_ptr();
 
-/// append `data` to `buf`, assuming `data` is less than 16 bytes and that `buf` has enough space
-/// remaining to hold all bytes in `data`.
-///
-/// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
-#[inline(always)]
-unsafe fn append_string_lt_16_unchecked(buf: &mut alloc::string::String, data: &str) {
-    // SAFETY: todo
-    let buf = unsafe { buf.as_mut_vec() };
-    let new_bytes = data.as_bytes();
-
-    // should get DCE
-    if new_bytes.len() >= 16 {
-        unsafe { core::hint::unreachable_unchecked() }
-    }
+            let rem = new_bytes.len() as isize;
+
+            // set_len early because there is no way to avoid the following asm!() writing that
+            // same number of bytes into buf
+            buf.set_len(buf.len() + new_bytes.len());
 
-    unsafe {
-        let dest = buf.as_mut_ptr().offset(buf.len() as isize);
-        let src = new_bytes.as_ptr();
-
-        let rem = new_bytes.len() as isize;
-
-        // set_len early because there is no way to avoid the following asm!() writing that
-        // same number of bytes into buf
-        buf.set_len(buf.len() + new_bytes.len());
-
-        core::arch::asm!(
-            "7:",
-            "cmp {rem:e}, 8",
-            "jb 8f",
-            "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
-            "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
-            "sub {rem:e}, 8",
-            "jz 11f",
-            "8:",
-            "cmp {rem:e}, 4",
-            "jb 9f",
-            "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
-            "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
-            "sub {rem:e}, 4",
-            "jz 11f",
-            "9:",
-            "cmp {rem:e}, 2",
-            "jb 10f",
-            "mov {buf:x}, word ptr [{src} + {rem} - 2]",
-            "mov word ptr [{dest} + {rem} - 2], {buf:x}",
-            "sub {rem:e}, 2",
-            "jz 11f",
-            "10:",
-            "cmp {rem:e}, 1",
-            "jb 11f",
-            "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
-            "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
-            "11:",
-            src = in(reg) src,
-            dest = in(reg) dest,
-            rem = inout(reg) rem => _,
-            buf = out(reg) _,
-            options(nostack),
-        );
+            core::arch::asm!(
+                "8:",
+                "cmp {rem:e}, 4",
+                "jb 9f",
+                "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
+                "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
+                "sub {rem:e}, 4",
+                "jz 11f",
+                "9:",
+                "cmp {rem:e}, 2",
+                "jb 10f",
+                "mov {buf:x}, word ptr [{src} + {rem} - 2]",
+                "mov word ptr [{dest} + {rem} - 2], {buf:x}",
+                "sub {rem:e}, 2",
+                "jz 11f",
+                "10:",
+                "cmp {rem:e}, 1",
+                "jb 11f",
+                "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
+                "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
+                "11:",
+                src = in(reg) src,
+                dest = in(reg) dest,
+                rem = inout(reg) rem => _,
+                buf = out(reg) _,
+                options(nostack),
+            );
+        }
     }
-}
 
-/// append `data` to `buf`, assuming `data` is less than 32 bytes and that `buf` has enough space
-/// remaining to hold all bytes in `data`.
-///
-/// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
-#[inline(always)]
-unsafe fn append_string_lt_32_unchecked(buf: &mut alloc::string::String, data: &str) {
-    // SAFETY: todo
-    let buf = unsafe { buf.as_mut_vec() };
-    let new_bytes = data.as_bytes();
-
-    // should get DCE
-    if new_bytes.len() >= 32 {
-        unsafe { core::hint::unreachable_unchecked() }
+    /// append `data` to `buf`, assuming `data` is less than 16 bytes and that `buf` has enough space
+    /// remaining to hold all bytes in `data`.
+    ///
+    /// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
+    #[inline(always)]
+    pub unsafe fn append_string_lt_16_unchecked(buf: &mut alloc::string::String, data: &str) {
+        // SAFETY: todo
+        let buf = unsafe { buf.as_mut_vec() };
+        let new_bytes = data.as_bytes();
+
+        // should get DCE
+        if new_bytes.len() >= 16 {
+            unsafe { core::hint::unreachable_unchecked() }
+        }
+
+        unsafe {
+            let dest = buf.as_mut_ptr().offset(buf.len() as isize);
+            let src = new_bytes.as_ptr();
+
+            let rem = new_bytes.len() as isize;
+
+            // set_len early because there is no way to avoid the following asm!() writing that
+            // same number of bytes into buf
+            buf.set_len(buf.len() + new_bytes.len());
+
+            core::arch::asm!(
+                "7:",
+                "cmp {rem:e}, 8",
+                "jb 8f",
+                "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
+                "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
+                "sub {rem:e}, 8",
+                "jz 11f",
+                "8:",
+                "cmp {rem:e}, 4",
+                "jb 9f",
+                "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
+                "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
+                "sub {rem:e}, 4",
+                "jz 11f",
+                "9:",
+                "cmp {rem:e}, 2",
+                "jb 10f",
+                "mov {buf:x}, word ptr [{src} + {rem} - 2]",
+                "mov word ptr [{dest} + {rem} - 2], {buf:x}",
+                "sub {rem:e}, 2",
+                "jz 11f",
+                "10:",
+                "cmp {rem:e}, 1",
+                "jb 11f",
+                "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
+                "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
+                "11:",
+                src = in(reg) src,
+                dest = in(reg) dest,
+                rem = inout(reg) rem => _,
+                buf = out(reg) _,
+                options(nostack),
+            );
+        }
     }
 
-    unsafe {
-        let dest = buf.as_mut_ptr().offset(buf.len() as isize);
-        let src = new_bytes.as_ptr();
-
-        let rem = new_bytes.len() as isize;
-
-        // set_len early because there is no way to avoid the following asm!() writing that
-        // same number of bytes into buf
-        buf.set_len(buf.len() + new_bytes.len());
-
-        core::arch::asm!(
-            "6:",
-            "cmp {rem:e}, 16",
-            "jb 7f",
-            "mov {buf:r}, qword ptr [{src} + {rem} - 16]",
-            "mov qword ptr [{dest} + {rem} - 16], {buf:r}",
-            "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
-            "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
-            "sub {rem:e}, 16",
-            "jz 11f",
-            "7:",
-            "cmp {rem:e}, 8",
-            "jb 8f",
-            "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
-            "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
-            "sub {rem:e}, 8",
-            "jz 11f",
-            "8:",
-            "cmp {rem:e}, 4",
-            "jb 9f",
-            "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
-            "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
-            "sub {rem:e}, 4",
-            "jz 11f",
-            "9:",
-            "cmp {rem:e}, 2",
-            "jb 10f",
-            "mov {buf:x}, word ptr [{src} + {rem} - 2]",
-            "mov word ptr [{dest} + {rem} - 2], {buf:x}",
-            "sub {rem:e}, 2",
-            "jz 11f",
-            "10:",
-            "cmp {rem:e}, 1",
-            "jb 11f",
-            "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
-            "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
-            "11:",
-            src = in(reg) src,
-            dest = in(reg) dest,
-            rem = inout(reg) rem => _,
-            buf = out(reg) _,
-            options(nostack),
-        );
+    /// append `data` to `buf`, assuming `data` is less than 32 bytes and that `buf` has enough space
+    /// remaining to hold all bytes in `data`.
+    ///
+    /// Safety: callers must ensure that `buf.capacity() - buf.len() >= data.len()`.
+    #[inline(always)]
+    pub unsafe fn append_string_lt_32_unchecked(buf: &mut alloc::string::String, data: &str) {
+        // SAFETY: todo
+        let buf = unsafe { buf.as_mut_vec() };
+        let new_bytes = data.as_bytes();
+
+        // should get DCE
+        if new_bytes.len() >= 32 {
+            unsafe { core::hint::unreachable_unchecked() }
+        }
+
+        unsafe {
+            let dest = buf.as_mut_ptr().offset(buf.len() as isize);
+            let src = new_bytes.as_ptr();
+
+            let rem = new_bytes.len() as isize;
+
+            // set_len early because there is no way to avoid the following asm!() writing that
+            // same number of bytes into buf
+            buf.set_len(buf.len() + new_bytes.len());
+
+            core::arch::asm!(
+                "6:",
+                "cmp {rem:e}, 16",
+                "jb 7f",
+                "mov {buf:r}, qword ptr [{src} + {rem} - 16]",
+                "mov qword ptr [{dest} + {rem} - 16], {buf:r}",
+                "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
+                "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
+                "sub {rem:e}, 16",
+                "jz 11f",
+                "7:",
+                "cmp {rem:e}, 8",
+                "jb 8f",
+                "mov {buf:r}, qword ptr [{src} + {rem} - 8]",
+                "mov qword ptr [{dest} + {rem} - 8], {buf:r}",
+                "sub {rem:e}, 8",
+                "jz 11f",
+                "8:",
+                "cmp {rem:e}, 4",
+                "jb 9f",
+                "mov {buf:e}, dword ptr [{src} + {rem} - 4]",
+                "mov dword ptr [{dest} + {rem} - 4], {buf:e}",
+                "sub {rem:e}, 4",
+                "jz 11f",
+                "9:",
+                "cmp {rem:e}, 2",
+                "jb 10f",
+                "mov {buf:x}, word ptr [{src} + {rem} - 2]",
+                "mov word ptr [{dest} + {rem} - 2], {buf:x}",
+                "sub {rem:e}, 2",
+                "jz 11f",
+                "10:",
+                "cmp {rem:e}, 1",
+                "jb 11f",
+                "mov {buf:l}, byte ptr [{src} + {rem} - 1]",
+                "mov byte ptr [{dest} + {rem} - 1], {buf:l}",
+                "11:",
+                src = in(reg) src,
+                dest = in(reg) dest,
+                rem = inout(reg) rem => _,
+                buf = out(reg) _,
+                options(nostack),
+            );
+        }
     }
 }
-- 
cgit v1.1