Fix width/height bound checks in stage-3 logger

Author: phil-opp

bios/stage-3/src/screen.rs

@@ -74,15 +74,13 @@ impl ScreenWriter {
             '\n' => self.newline(),
             '\r' => self.carriage_return(),
             c => {
-                if self.x_pos >= self.width() {
+                let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();
+                if self.x_pos + bitmap_char.width() > self.width() {
                     self.newline();
                 }
-                const BITMAP_LETTER_WIDTH: usize =
-                    get_bitmap_width(FontWeight::Regular, BitmapHeight::Size14);
-                if self.y_pos >= (self.height() - BITMAP_LETTER_WIDTH) {
+                if self.y_pos + bitmap_char.height() > self.height() {
                     self.clear();
                 }
-                let bitmap_char = get_bitmap(c, FontWeight::Regular, BitmapHeight::Size14).unwrap();
                 self.write_rendered_char(bitmap_char);
             }
         }