:: commit da72f9c2643e033f55bd4e97f57dac2c338a0339
term: Undo most of commit 1332be4 as that causes a performance hit on QEMU TCG
diff --git a/stage23/drivers/vga_textmode.s2.c b/stage23/drivers/vga_textmode.s2.c
index a2203306..f3a97cfb 100644
--- a/stage23/drivers/vga_textmode.s2.c
+++ b/stage23/drivers/vga_textmode.s2.c
@@ -190,7 +190,7 @@ void text_double_buffer_flush(void) {
draw_cursor();
}
- if (cursor_offset != old_cursor_offset) {
+ if (cursor_offset != old_cursor_offset || cursor_status == false) {
video_mem[old_cursor_offset + 1] = back_buffer[old_cursor_offset + 1];
}
diff --git a/stage23/lib/gterm.c b/stage23/lib/gterm.c
index 836f2458..5b96c404 100644
--- a/stage23/lib/gterm.c
+++ b/stage23/lib/gterm.c
@@ -28,6 +28,8 @@ static size_t glyph_height = 16;
static size_t vga_font_scale_x = 1;
static size_t vga_font_scale_y = 1;
+static size_t offset_x, offset_y;
+
struct fb_info fbinfo;
static volatile uint32_t *gterm_framebuffer;
static uint16_t gterm_pitch;
@@ -275,9 +277,6 @@ static void plot_char(struct gterm_char *c, size_t x, size_t y) {
return;
}
- size_t offset_x = margin + ((gterm_width - margin * 2) % glyph_width) / 2;
- size_t offset_y = margin + ((gterm_height - margin * 2) % glyph_height) / 2;
-
x = offset_x + x * glyph_width;
y = offset_y + y * glyph_height;
@@ -299,58 +298,30 @@ static void plot_char(struct gterm_char *c, size_t x, size_t y) {
}
}
-static size_t plot_from_queue(struct queue_item *qu, size_t max) {
- size_t offset_x = margin + ((gterm_width - margin * 2) % glyph_width) / 2;
- size_t offset_y = margin + ((gterm_height - margin * 2) % glyph_height) / 2;
+static void plot_char_fast(struct gterm_char *old, struct gterm_char *c, size_t x, size_t y) {
+ if (x >= cols || y >= rows) {
+ return;
+ }
- for (size_t gy = 0; ; gy++) {
- size_t y = offset_y + qu->y * glyph_height;
- size_t fy = (gy / vga_font_scale_y) * vga_font_width;
- volatile uint32_t *fb_line = gterm_framebuffer + (y + gy) * (gterm_pitch / 4);
- uint32_t *canvas_line = bg_canvas + (y + gy) * gterm_width;
- for (size_t qi = 0; ; qi++) {
- struct queue_item *q = &qu[qi];
- if (qi != 0 && q->y != qu[qi - 1].y) {
- if (gy == glyph_height - 1) {
- return qi;
- } else {
- // break to next line
- break;
- }
- }
- size_t offset = q->y * cols + q->x;
- if (map[offset] == NULL) {
- goto epilogue;
- }
- size_t x = offset_x + q->x * glyph_width;
- struct gterm_char *old = &grid[offset];
- bool *new_glyph = &vga_font_bool[q->c.c * vga_font_height * vga_font_width];
- bool *old_glyph = &vga_font_bool[old->c * vga_font_height * vga_font_width];
- bool same_palette = q->c.fg == old->fg && q->c.bg == old->bg;
- for (size_t fx = 0; fx < vga_font_width; fx++) {
- bool old_draw = old_glyph[fy + fx];
- bool new_draw = new_glyph[fy + fx];
- if (old_draw == new_draw && same_palette) {
- continue;
- }
- for (size_t i = 0; i < vga_font_scale_x; i++) {
- size_t gx = x + vga_font_scale_x * fx + i;
- uint32_t bg = q->c.bg == 0xffffffff ? canvas_line[gx] : q->c.bg;
- uint32_t fg = q->c.fg == 0xffffffff ? canvas_line[gx] : q->c.fg;
- fb_line[gx] = new_draw ? fg : bg;
- }
- }
- if (gy == glyph_height - 1) {
- grid[offset] = q->c;
- map[offset] = NULL;
- }
-epilogue:
- if (qi == max - 1) {
- if (gy == glyph_height - 1) {
- return max;
- } else {
- break;
- }
+ x = offset_x + x * glyph_width;
+ y = offset_y + y * glyph_height;
+
+ bool *new_glyph = &vga_font_bool[c->c * vga_font_height * vga_font_width];
+ bool *old_glyph = &vga_font_bool[old->c * vga_font_height * vga_font_width];
+ for (size_t gy = 0; gy < glyph_height; gy++) {
+ uint8_t fy = gy / vga_font_scale_y;
+ volatile uint32_t *fb_line = gterm_framebuffer + x + (y + gy) * (gterm_pitch / 4);
+ uint32_t *canvas_line = bg_canvas + x + (y + gy) * gterm_width;
+ for (size_t fx = 0; fx < vga_font_width; fx++) {
+ bool old_draw = old_glyph[fy * vga_font_width + fx];
+ bool new_draw = new_glyph[fy * vga_font_width + fx];
+ if (old_draw == new_draw)
+ continue;
+ for (size_t i = 0; i < vga_font_scale_x; i++) {
+ size_t gx = vga_font_scale_x * fx + i;
+ uint32_t bg = c->bg == 0xffffffff ? canvas_line[gx] : c->bg;
+ uint32_t fg = c->fg == 0xffffffff ? canvas_line[gx] : c->fg;
+ fb_line[gx] = new_draw ? fg : bg;
}
}
}
@@ -534,11 +505,23 @@ void gterm_double_buffer_flush(void) {
draw_cursor();
}
- for (size_t i = 0; i < queue_i; ) {
- i += plot_from_queue(&queue[i], queue_i - i);
+ for (size_t i = 0; i < queue_i; i++) {
+ struct queue_item *q = &queue[i];
+ size_t offset = q->y * cols + q->x;
+ if (map[offset] == NULL) {
+ continue;
+ }
+ struct gterm_char *old = &grid[offset];
+ if (q->c.bg == old->bg && q->c.fg == old->fg) {
+ plot_char_fast(old, &q->c, q->x, q->y);
+ } else {
+ plot_char(&q->c, q->x, q->y);
+ }
+ grid[offset] = q->c;
+ map[offset] = NULL;
}
- if (old_cursor_x != cursor_x || old_cursor_y != cursor_y) {
+ if ((old_cursor_x != cursor_x || old_cursor_y != cursor_y) || cursor_status == false) {
plot_char(&grid[old_cursor_x + old_cursor_y * cols], old_cursor_x, old_cursor_y);
}
@@ -838,6 +821,9 @@ no_load_font:;
*_cols = cols = (gterm_width - margin * 2) / glyph_width;
*_rows = rows = (gterm_height - margin * 2) / glyph_height;
+ offset_x = margin + ((gterm_width - margin * 2) % glyph_width) / 2;
+ offset_y = margin + ((gterm_height - margin * 2) % glyph_height) / 2;
+
size_t new_grid_size = rows * cols * sizeof(struct gterm_char);
if (new_grid_size > last_grid_size) {
grid = ext_mem_alloc(new_grid_size);
diff --git a/stage23/lib/term.s2.c b/stage23/lib/term.s2.c
index 7212a0f6..eeb8df2e 100644
--- a/stage23/lib/term.s2.c
+++ b/stage23/lib/term.s2.c
@@ -16,8 +16,6 @@ int term_backend = NOT_READY;
size_t term_rows, term_cols;
bool term_runtime = false;
-static bool old_cur_stat;
-
void (*raw_putchar)(uint8_t c);
void (*clear)(bool move);
void (*enable_cursor)(void);
@@ -198,11 +196,8 @@ void term_write(uint64_t buf, uint64_t count) {
if (!term_runtime || native) {
const char *s = (const char *)(uintptr_t)buf;
- old_cur_stat = disable_cursor();
for (size_t i = 0; i < count; i++)
term_putchar(s[i]);
- if (old_cur_stat)
- enable_cursor();
} else {
#if defined (__i386__)
while (count != 0) {
@@ -215,11 +210,8 @@ void term_write(uint64_t buf, uint64_t count) {
memcpy32to64((uint64_t)(uintptr_t)xfer_buf, buf, chunk);
- old_cur_stat = disable_cursor();
for (size_t i = 0; i < chunk; i++)
term_putchar(xfer_buf[i]);
- if (old_cur_stat)
- enable_cursor();
count -= chunk;
buf += chunk;
@@ -401,8 +393,14 @@ static void dec_private_parse(uint8_t c) {
}
switch (esc_values[0]) {
- case 25:
- old_cur_stat = set; return;
+ case 25: {
+ if (set) {
+ enable_cursor();
+ } else {
+ disable_cursor();
+ }
+ return;
+ }
}
if (term_callback != NULL) {
