finish VGA

Author: liW-J

abstract-machine/am/src/platform/nemu/ioe/gpu.c

@@ -1,23 +1,49 @@
 #include <am.h>
 #include <nemu.h>
+#include <string.h>
+#include <stdio.h>
 
 #define SYNC_ADDR (VGACTL_ADDR + 4)
 
+#define WMASK 0xffff0000
+#define HMASK 0x0000ffff
+
+static int width  = 0;
+static int height = 0;
+
 void __am_gpu_init() {
+  uint32_t cfg = inl(VGACTL_ADDR);
+  width = cfg & WMASK >> 16;  
+  height = cfg & HMASK;  
+  // uint32_t *fb = (uint32_t *)(uintptr_t)FB_ADDR;
+  // for (int i = 0; i < width * height; i ++) fb[i] = i;
+
+  outl(SYNC_ADDR, 1);
 }
 
 void __am_gpu_config(AM_GPU_CONFIG_T *cfg) {
   *cfg = (AM_GPU_CONFIG_T) {
     .present = true, .has_accel = false,
-    .width = 0, .height = 0,
+    .width = width, .height = height,
     .vmemsz = 0
   };
 }
 
 void __am_gpu_fbdraw(AM_GPU_FBDRAW_T *ctl) {
-  if (ctl->sync) {
-    outl(SYNC_ADDR, 1);
+  int x = ctl->x, y = ctl->y, w = ctl->w, h = ctl->h;
+  if (w == 0 || h == 0) return;
+
+  uint32_t *pixels = ctl->pixels;
+  uint32_t *fb = (uint32_t *)(uintptr_t)FB_ADDR;
+  uint32_t screen_w = inl(VGACTL_ADDR) >> 16;
+  for (int i = y; i < y+h; i++) {
+    for (int j = x; j < x+w; j++) {
+      fb[screen_w*i+j] = pixels[w*(i-y)+(j-x)]; //缓冲区是一个像素块
+    }
   }
+
+  if (ctl->sync) outl(SYNC_ADDR, 1);
+
 }
 
 void __am_gpu_status(AM_GPU_STATUS_T *status) {

abstract-machine/klib/src/stdio.c

@@ -20,7 +20,7 @@ unsigned long m_pow_n(unsigned long m, unsigned long n)
 int printf(const char *fmt, ...) {
   va_list ap;
   va_start(ap, fmt);
-  char out[4096];
+  char out[409600];
   int length = vsprintf(out, fmt, ap);
   for (int i = 0; i < length; i++) {
     putch(out[i]);

am-kernels/kernels/demo/include/io.h

@@ -1,6 +1,6 @@
 #ifndef __DRAW_H__
 
-// #define HAS_GUI
+#define HAS_GUI
 
 #include <stdio.h>
 #include <am.h>

nemu/src/device/vga.c

@@ -72,8 +72,7 @@ static inline void update_screen() {
 #endif
 
 void vga_update_screen() {
-  // TODO: call `update_screen()` when the sync register is non-zero,
-  // then zero out the sync register
+  if (vgactl_port_base[1] != 0) update_screen();
 }
 
 void init_vga() {

nemu/src/monitor/trace/iringbuf.c

@@ -14,6 +14,8 @@ int p_cur = 0;
 int p_error = 0;
 bool is_full = false;
 
+#if defined(CONFIG_IRINGBUF_COND)
+
 void iringbuf_inst(word_t pc, uint32_t inst) {
   iringbuf[p_cur].pc = pc;
   iringbuf[p_cur].inst = inst;
@@ -42,4 +44,4 @@ void display_iringbuf() {
 
 }
 
-
+#endif

npc/sim/monitor/trace/iringbuf.c

@@ -14,6 +14,8 @@ int p_cur = 0;
 int p_error = 0;
 bool is_full = false;
 
+#if defined(CONFIG_IRINGBUF_COND)
+
 void iringbuf_inst(word_t pc, uint32_t inst) {
   iringbuf[p_cur].pc = pc;
   iringbuf[p_cur].inst = inst;
@@ -42,4 +44,4 @@ void display_iringbuf() {
 
 }
 
-
+#endif