From 6334f837e25ebdc68d4ef7af72efdf0ee4dab99a Mon Sep 17 00:00:00 2001 From: Bryce Denney Date: Tue, 21 Aug 2001 04:10:35 +0000 Subject: [PATCH] - now BIOS messages have prefix "BIOS" instead of "UNMP" --- bochs/bochs.h | 1 + bochs/iodev/unmapped.cc | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bochs/bochs.h b/bochs/bochs.h index d39218f42..ec9b210f0 100644 --- a/bochs/bochs.h +++ b/bochs/bochs.h @@ -313,6 +313,7 @@ class iofunctions { #define CTRLLOG 41 #define UNMAPLOG 42 #define SERRLOG 43 +#define BIOSLOG 42 public: diff --git a/bochs/iodev/unmapped.cc b/bochs/iodev/unmapped.cc index c7c7eeac0..4a27a227b 100644 --- a/bochs/iodev/unmapped.cc +++ b/bochs/iodev/unmapped.cc @@ -31,11 +31,15 @@ bx_unmapped_c bx_unmapped; #define this (&bx_unmapped) #endif +logfunctions *bioslog; bx_unmapped_c::bx_unmapped_c(void) { put("UNMP"); settype(UNMAPLOG); + bioslog = new logfunctions (); + bioslog->put("BIOS"); + bioslog->settype (BIOSLOG); s.port80 = 0x00; s.port8e = 0x00; @@ -243,11 +247,11 @@ bx_unmapped_c::write(Bit32u address, Bit32u value, unsigned io_len) BX_UM_THIS s.bios_message_i = BX_BIOS_MESSAGE_SIZE-1; BX_UM_THIS s.bios_message[ BX_UM_THIS s.bios_message_i] = 0; BX_UM_THIS s.bios_message_i = 0; - BX_PANIC((BX_UM_THIS s.bios_message)); + bioslog->panic((BX_UM_THIS s.bios_message)); break; } case 0x0400: - BX_PANIC(("BIOS panic at rombios.c, line %d", value)); + bioslog->panic("BIOS panic at rombios.c, line %d", value); break; case 0xfedc: bx_dbg.debugger = (value > 0); @@ -261,12 +265,12 @@ bx_unmapped_c::write(Bit32u address, Bit32u value, unsigned io_len) if ( BX_UM_THIS s.bios_message_i >= BX_BIOS_MESSAGE_SIZE ) { BX_UM_THIS s.bios_message[ BX_BIOS_MESSAGE_SIZE - 1] = 0; BX_UM_THIS s.bios_message_i = 0; - BX_INFO(("BIOS message: %s", BX_UM_THIS s.bios_message)); + bioslog->info("BIOS message: %s", BX_UM_THIS s.bios_message); } else if ((value & 0xff) == '\n') { BX_UM_THIS s.bios_message[ BX_UM_THIS s.bios_message_i - 1 ] = 0; BX_UM_THIS s.bios_message_i = 0; - BX_INFO(("BIOS message: %s", BX_UM_THIS s.bios_message)); + bioslog->info("BIOS message: %s", BX_UM_THIS s.bios_message); } break;