OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

monitor fixes (Johannes Schindelin)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1109 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-10-09 17:32:58 +00:00
parent d75d9f6be9
commit 8e3a9fd280
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
console.c
View File

@ -570,8 +570,11 @@ void console_select(unsigned int index)
active_console = s;
if (s->text_console) {
if (s->g_width != s->ds->width ||
s->g_height != s->ds->height)
s->g_height != s->ds->height) {
s->g_width = s->ds->width;
s->g_height = s->ds->height;
text_console_resize(s);
}
console_refresh(s);
}
}

8
exec.c
View File

@ -1199,8 +1199,10 @@ CPULogItem cpu_log_items[] = {
{ CPU_LOG_PCALL, "pcall",
"show protected mode far calls/returns/exceptions" },
#endif
#ifdef DEBUG_IOPORT
{ CPU_LOG_IOPORT, "ioport",
"show all i/o ports accesses" },
#endif
{ 0, NULL, NULL },
};
@ -1224,11 +1226,17 @@ int cpu_str_to_log_mask(const char *str)
p1 = strchr(p, ',');
if (!p1)
p1 = p + strlen(p);
if(cmp1(p,p1-p,"all")) {
for(item = cpu_log_items; item->mask != 0; item++) {
mask |= item->mask;
}
} else {
for(item = cpu_log_items; item->mask != 0; item++) {
if (cmp1(p, p1 - p, item->name))
goto found;
}
return 0;
}
found:
mask |= item->mask;
if (*p1 != ',')

22
hw/pci.c
View File

@ -1241,40 +1241,40 @@ static void pci_info_device(PCIDevice *d)
int i, class;
PCIIORegion *r;
printf(" Bus %2d, device %3d, function %d:\n",
term_printf(" Bus %2d, device %3d, function %d:\n",
d->bus->bus_num, d->devfn >> 3, d->devfn & 7);
class = le16_to_cpu(*((uint16_t *)(d->config + PCI_CLASS_DEVICE)));
printf(" ");
term_printf(" ");
switch(class) {
case 0x0101:
printf("IDE controller");
term_printf("IDE controller");
break;
case 0x0200:
printf("Ethernet controller");
term_printf("Ethernet controller");
break;
case 0x0300:
printf("VGA controller");
term_printf("VGA controller");
break;
default:
printf("Class %04x", class);
term_printf("Class %04x", class);
break;
}
printf(": PCI device %04x:%04x\n",
term_printf(": PCI device %04x:%04x\n",
le16_to_cpu(*((uint16_t *)(d->config + PCI_VENDOR_ID))),
le16_to_cpu(*((uint16_t *)(d->config + PCI_DEVICE_ID))));
if (d->config[PCI_INTERRUPT_PIN] != 0) {
printf(" IRQ %d.\n", d->config[PCI_INTERRUPT_LINE]);
term_printf(" IRQ %d.\n", d->config[PCI_INTERRUPT_LINE]);
}
for(i = 0;i < PCI_NUM_REGIONS; i++) {
r = &d->io_regions[i];
if (r->size != 0) {
printf(" BAR%d: ", i);
term_printf(" BAR%d: ", i);
if (r->type & PCI_ADDRESS_SPACE_IO) {
printf("I/O at 0x%04x [0x%04x].\n",
term_printf("I/O at 0x%04x [0x%04x].\n",
r->addr, r->addr + r->size - 1);
} else {
printf("32 bit memory at 0x%08x [0x%08x].\n",
term_printf("32 bit memory at 0x%08x [0x%08x].\n",
r->addr, r->addr + r->size - 1);
}
}

1
monitor.c
View File

@ -223,6 +223,7 @@ static void do_info_history (void)
if (!str)
break;
term_printf("%d: '%s'\n", i, str);
i++;
}
}