Changeset 33511 in vbox for trunk/src

Timestamp:

Oct 27, 2010 1:57:33 PM (14 years ago)

Author:

vboxsync

Message:

DevVGA: Always build logging in debug builds, with different levels. Also removed obsolete debug print screen code.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -376 +376 @@
 }
 
-#ifdef LOG_ENABLED
-//#define DEBUG_VGA
-//#define DEBUG_VGA_MEM
-//#define DEBUG_VGA_REG
-
-#define DEBUG_BOCHS_VBE
-
-#endif
-
 /* force some bits to zero */
 static const uint8_t sr_mask[8] = {
@@ -534 +525 @@
         case 0x3c5:
             val = s->sr[s->sr_index];
-#ifdef DEBUG_VGA_REG
-            Log(("vga: read SR%x = 0x%02x\n", s->sr_index, val));
-#endif
+            Log2(("vga: read SR%x = 0x%02x\n", s->sr_index, val));
             break;
         case 0x3c7:
@@ -562 +551 @@
         case 0x3cf:
             val = s->gr[s->gr_index];
-#ifdef DEBUG_VGA_REG
-            Log(("vga: read GR%x = 0x%02x\n", s->gr_index, val));
-#endif
+            Log2(("vga: read GR%x = 0x%02x\n", s->gr_index, val));
             break;
         case 0x3b4:
@@ -573 +560 @@
         case 0x3d5:
             val = s->cr[s->cr_index];
-#ifdef DEBUG_VGA_REG
-            Log(("vga: read CR%x = 0x%02x\n", s->cr_index, val));
-#endif
+            Log2(("vga: read CR%x = 0x%02x\n", s->cr_index, val));
             break;
         case 0x3ba:
@@ -589 +574 @@
         }
     }
-#if defined(DEBUG_VGA)
     Log(("VGA: read addr=0x%04x data=0x%02x\n", addr, val));
-#endif
     return val;
 }
@@ -600 +583 @@
     int index;
 
-#ifdef DEBUG_VGA
     Log(("VGA: write addr=0x%04x data=0x%02x\n", addr, val));
-#endif
 
     /* check port range access depending on color/monochrome mode */
@@ -651 +632 @@
         break;
     case 0x3c5:
-#ifdef DEBUG_VGA_REG
-        Log(("vga: write SR%x = 0x%02x\n", s->sr_index, val));
-#endif
+        Log2(("vga: write SR%x = 0x%02x\n", s->sr_index, val));
         s->sr[s->sr_index] = val & sr_mask[s->sr_index];
 
@@ -691 +670 @@
         break;
     case 0x3cf:
-#ifdef DEBUG_VGA_REG
-        Log(("vga: write GR%x = 0x%02x\n", s->gr_index, val));
-#endif
+        Log2(("vga: write GR%x = 0x%02x\n", s->gr_index, val));
         s->gr[s->gr_index] = val & gr_mask[s->gr_index];
 
@@ -715 +692 @@
     case 0x3b5:
     case 0x3d5:
-#ifdef DEBUG_VGA_REG
-        Log(("vga: write CR%x = 0x%02x\n", s->cr_index, val));
-#endif
+        Log2(("vga: write CR%x = 0x%02x\n", s->cr_index, val));
         /* handle CR0-7 protection */
         if ((s->cr[0x11] & 0x80) && s->cr_index <= 7) {
@@ -794 +769 @@
         val = 0;
     }
-#ifdef DEBUG_BOCHS_VBE
     Log(("VBE: read index=0x%x val=0x%x\n", s->vbe_index, val));
-#endif
     return val;
 }
@@ -845 +818 @@
 
     if (s->vbe_index <= VBE_DISPI_INDEX_NB) {
-#ifdef DEBUG_BOCHS_VBE
         Log(("VBE: write index=0x%x val=0x%x\n", s->vbe_index, val));
-#endif
         switch(s->vbe_index) {
         case VBE_DISPI_INDEX_ID:
@@ -1113 +1084 @@
     uint32_t ret;
 
-#ifdef DEBUG_VGA_MEM
-    Log(("vga: read [0x%x] -> ", addr));
-#endif
+    Log3(("vga: read [0x%x] -> ", addr));
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
@@ -1183 +1152 @@
         }
     }
-#ifdef DEBUG_VGA_MEM
-    Log((" 0x%02x\n", ret));
-#endif
+    Log3((" 0x%02x\n", ret));
     return ret;
 }
@@ -1196 +1163 @@
     uint32_t write_mask, bit_mask, set_mask;
 
-#ifdef DEBUG_VGA_MEM
-    Log(("vga: [0x%x] = 0x%02x\n", addr, val));
-#endif
+    Log3(("vga: [0x%x] = 0x%02x\n", addr, val));
     /* convert to VGA memory offset */
     memory_map_mode = (s->gr[6] >> 2) & 3;
@@ -1243 +1208 @@
             VERIFY_VRAM_WRITE_OFF_RETURN(s, addr);
             s->CTX_SUFF(vram_ptr)[addr] = val;
-#ifdef DEBUG_VGA_MEM
-            Log(("vga: chain4: [0x%x]\n", addr));
-#endif
+            Log3(("vga: chain4: [0x%x]\n", addr));
             s->plane_updated |= mask; /* only used to detect font change */
             vga_set_dirty(s, addr);
@@ -1262 +1225 @@
             VERIFY_VRAM_WRITE_OFF_RETURN(s, addr);
             s->CTX_SUFF(vram_ptr)[addr] = val;
-#ifdef DEBUG_VGA_MEM
-            Log(("vga: odd/even: [0x%x]\n", addr));
-#endif
+            Log3(("vga: odd/even: [0x%x]\n", addr));
             s->plane_updated |= mask; /* only used to detect font change */
             vga_set_dirty(s, addr);
@@ -1377 +1338 @@
             (((uint32_t *)s->CTX_SUFF(vram_ptr))[addr] & ~write_mask) |
             (val & write_mask);
-#ifdef DEBUG_VGA_MEM
-            Log(("vga: latch: [0x%x] mask=0x%08x val=0x%08x\n",
+            Log3(("vga: latch: [0x%x] mask=0x%08x val=0x%08x\n",
                    addr * 4, write_mask, val));
-#endif
             vga_set_dirty(s, (addr << 2));
     }
@@ -5211 +5170 @@
     /* Clear the VRAM ourselves. */
     if (pThis->vram_ptrR3 && pThis->vram_size)
-    {
-#ifdef LOG_ENABLED /** @todo separate function. */
-        /* First dump the textmode contents to the log; handy for capturing Windows blue screens. */
-        uint8_t graphic_mode;
-        VGAState *s = pThis;
-
-        if (!(s->ar_index & 0x20)) {
-            graphic_mode = GMODE_BLANK;
-        } else {
-            graphic_mode = s->gr[6] & 1;
-        }
-        switch(graphic_mode)
-        case GMODE_TEXT:
-        {
-            int cw, height, width, cheight, cx_min, cx_max, cy, cx;
-            int x_incr;
-            uint8_t *s1, *src, ch, cattr;
-            int line_offset;
-            uint16_t ch_attr;
-
-            line_offset = s->line_offset;
-            s1 = s->CTX_SUFF(vram_ptr) + (s->start_addr * 4);
-
-            /* total width & height */
-            cheight = (s->cr[9] & 0x1f) + 1;
-            cw = 8;
-            if (!(s->sr[1] & 0x01))
-                cw = 9;
-            if (s->sr[1] & 0x08)
-                cw = 16; /* NOTE: no 18 pixel wide */
-            x_incr = cw * ((s->pDrv->cBits + 7) >> 3);
-            width = (s->cr[0x01] + 1);
-            if (s->cr[0x06] == 100) {
-                /* ugly hack for CGA 160x100x16 - explain me the logic */
-                height = 100;
-            } else {
-                height = s->cr[0x12] |
-                    ((s->cr[0x07] & 0x02) << 7) |
-                    ((s->cr[0x07] & 0x40) << 3);
-                height = (height + 1) / cheight;
-            }
-            if ((height * width) > CH_ATTR_SIZE) {
-                /* better than nothing: exit if transient size is too big */
-                break;
-            }
-            RTLogPrintf("VGA textmode BEGIN (%dx%d):\n\n", height, width);
-            for(cy = 0; cy < height; cy++) {
-                src = s1;
-                cx_min = width;
-                cx_max = -1;
-                for(cx = 0; cx < width; cx++) {
-                    ch_attr = *(uint16_t *)src;
-                    if (cx < cx_min)
-                        cx_min = cx;
-                    if (cx > cx_max)
-                        cx_max = cx;
-# ifdef WORDS_BIGENDIAN
-                    ch = ch_attr >> 8;
-                    cattr = ch_attr & 0xff;
-# else
-                    ch = ch_attr & 0xff;
-                    cattr = ch_attr >> 8;
-# endif
-                    RTLogPrintf("%c", ch);
-
-                    src += 8; /* Every second byte of a plane is used in text mode. */
-                }
-                if (cx_max != -1)
-                    RTLogPrintf("\n");
-
-                s1 += line_offset;
-            }
-            RTLogPrintf("VGA textmode END:\n\n");
-        }
-
-#endif /* LOG_ENABLED */
         memset(pThis->vram_ptrR3, 0, pThis->vram_size);
-    }
 
     /*