From d3ccba09437c0e2a8f089ceba946360a40d4dc19 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:33:18 +0100
Subject: [PATCH] Avoid int2ptr cast in DebugDisplay

---
 src/devices/graphical_debug/debug.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/devices/graphical_debug/debug.rs b/src/devices/graphical_debug/debug.rs
index 5350879a7c..f3daac0807 100644
--- a/src/devices/graphical_debug/debug.rs
+++ b/src/devices/graphical_debug/debug.rs
@@ -65,8 +65,12 @@ impl DebugDisplay {
     /// Draw a character
     pub fn char(&mut self, x: usize, y: usize, character: char, color: u32) {
         if x + 8 <= self.display.width && y + 16 <= self.display.height {
-            let mut dst =
-                self.display.data_mut().as_mut_ptr() as usize + (y * self.display.stride + x) * 4;
+            let mut dst = unsafe {
+                self.display
+                    .data_mut()
+                    .as_mut_ptr()
+                    .add(y * self.display.stride + x)
+            };
 
             let font_i = 16 * (character as usize);
             if font_i + 16 <= FONT.len() {
@@ -75,11 +79,11 @@ impl DebugDisplay {
                     for col in 0..8 {
                         if (row_data >> (7 - col)) & 1 == 1 {
                             unsafe {
-                                *((dst + col * 4) as *mut u32) = color;
+                                *dst.add(col) = color;
                             }
                         }
                     }
-                    dst += self.display.stride * 4;
+                    dst = unsafe { dst.add(self.display.stride) };
                 }
             }
         }