From e4a1f529efffb17f485466e9ddc6d946638db5e7 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Fri, 13 Dec 2024 15:09:20 -0700
Subject: [PATCH] Replace `fast_{copy,set32}` with native Rust

Remove x86 specific logic implementing memcpy and memset, for
functionality that is barely used to begin with.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 src/display.rs | 41 +++++++++--------------------------------
 src/text.rs    |  7 +++++--
 2 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/display.rs b/src/display.rs
index 60e6bde..a9cad27 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use core::arch::asm;
 use core::cell::Cell;
 use orbclient::{Color, Mode, Renderer};
 use std::prelude::*;
@@ -61,16 +60,22 @@ impl Display {
         let width = self.w as usize;
         let height = self.h as usize;
         if rows > 0 && rows < height {
+            // Offset of region to start copy from
             let off1 = rows * width;
+            // Size of region to copy / Offset of region to clear
             let off2 = height * width - off1;
             unsafe {
                 let data_ptr = self.data.as_mut_ptr() as *mut u32;
-                fast_copy(
-                    data_ptr as *mut u8,
+
+                // Move data up
+                core::ptr::copy(
                     data_ptr.add(off1) as *const u8,
+                    data_ptr as *mut u8,
                     off2 * 4,
                 );
-                fast_set32(data_ptr.add(off2), color.data, off1);
+
+                // Fill unused region
+                core::slice::from_raw_parts_mut(data_ptr.add(off2), off1).fill(color.data);
             }
         }
     }
@@ -178,31 +183,3 @@ impl<'a> Renderer for ScaledDisplay<'a> {
         self.display.mode()
     }
 }
-
-#[cfg(target_arch = "x86_64")]
-#[inline(always)]
-#[cold]
-pub unsafe fn fast_copy(dst: *mut u8, src: *const u8, len: usize) {
-    asm!(
-        "cld",
-        "rep movsb [rdi], [rsi]",
-        inout("rdi") dst => _,
-        inout("rsi") src => _,
-        inout("rcx") len => _,
-        options(nostack)
-    );
-}
-
-#[cfg(target_arch = "x86_64")]
-#[inline(always)]
-#[cold]
-pub unsafe fn fast_set32(dst: *mut u32, src: u32, len: usize) {
-    asm!(
-        "cld",
-        "rep stosd [rdi], eax",
-        inout("rdi") dst => _,
-        inout("eax") src => _,
-        inout("rcx") len => _,
-        options(nostack)
-    );
-}
diff --git a/src/text.rs b/src/text.rs
index 8a64713..8264972 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -149,13 +149,16 @@ impl<'a> TextDisplay<'a> {
             unsafe {
                 let scale = self.display.scale() as isize;
                 let data_ptr = self.display.data_mut().as_mut_ptr() as *mut u32;
-                crate::display::fast_copy(
-                    data_ptr.offset(dst as isize * scale * scale) as *mut u8,
+
+                // Move data up
+                core::ptr::copy(
                     data_ptr.offset(src as isize * scale * scale) as *const u8,
+                    data_ptr.offset(dst as isize * scale * scale) as *mut u8,
                     len * (scale * scale) as usize * 4,
                 );
             }
 
+            // Fill unused region
             self.display.rect(
                 self.off_x,
                 self.off_y + (self.rows as i32 - 1) * 16,