mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- modified the bios / vgabios panic handling. BX_PANIC messages sent by the bios

Browse Source 
now appear correctly as the Bochs panic message. Now we can get rid of messages
  with the line number in the source file.
- updated / fixed description in biosdev.cc
This commit is contained in:
Volker Ruppert 2004-09-05 17:57:22 +00:00
parent 8d585dc813
commit 9956e47f3e
7 changed files with 62 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bochs/bios/BIOS-bochs-2-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-4-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-8-processors
View File

Binary file not shown.

BIN
bochs/bios/BIOS-bochs-latest
View File

Binary file not shown.

27
bochs/bios/rombios.c
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: rombios.c,v 1.115 2004-09-03 19:49:37 vruppert Exp $
// $Id: rombios.c,v 1.116 2004-09-05 17:55:12 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -916,10 +916,10 @@ Bit16u cdrom_boot();
#endif // BX_ELTORITO_BOOT
static char bios_cvs_version_string[] = "$Revision: 1.115 $";
static char bios_date_string[] = "$Date: 2004-09-03 19:49:37 $";
static char bios_cvs_version_string[] = "$Revision: 1.116 $";
static char bios_date_string[] = "$Date: 2004-09-05 17:55:12 $";
static char CVSID[] = "$Id: rombios.c,v 1.115 2004-09-03 19:49:37 vruppert Exp $";
static char CVSID[] = "$Id: rombios.c,v 1.116 2004-09-05 17:55:12 vruppert Exp $";
/* Offset to skip the CVS $Id: prefix */
#define bios_version_string (CVSID + 4)
@ -1484,7 +1484,8 @@ bios_printf(action, s)
format_width = 0;
if ((action & BIOS_PRINTF_DEBHALT) == BIOS_PRINTF_DEBHALT) {
bios_printf (BIOS_PRINTF_ALL, "FATAL: ");
outb(PANIC_PORT2, 0x00);
bios_printf (BIOS_PRINTF_SCREEN, "FATAL: ");
}
while (c = read_byte(0xf000, s)) {
@ -1730,11 +1731,6 @@ shutdown_status_panic(status)
void
print_bios_banner()
{
/* test formats
bios_printf(BIOS_PRINTF_SCREEN, "Test: x234=%3x, d-123=%d, c=%c, s=%s\n",
0x1234, -123, '!', "ok");
*/
printf(BX_APPNAME" BIOS, %d cpu%s, ", BX_SMP_PROCESSORS, BX_SMP_PROCESSORS>1?"s":"");
printf("%s %s\n", bios_cvs_version_string, bios_date_string);
printf("\n");
@ -1807,7 +1803,13 @@ print_cdromboot_failure( code )
void
nmi_handler_msg()
{
BX_INFO("NMI Handler called\n");
BX_PANIC("NMI Handler called\n");
}
void
int18_panic_msg()
{
BX_PANIC("INT18: BOOT FAILURE\n");
}
void
@ -7881,8 +7883,8 @@ int13_eltorito:
;- INT18h -
;----------
int18_handler: ;; Boot Failure routing
call _int18_panic_msg
hlt
HALT(__LINE__)
iret
;----------
@ -9321,7 +9323,6 @@ nmi:
;; FIXME the NMI handler should not panic
;; but iret when called from int75 (fpu exception)
call _nmi_handler_msg
HALT(__LINE__)
iret
int75_handler:

79
bochs/iodev/biosdev.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: biosdev.cc,v 1.8 2004-06-19 15:20:10 sshwarts Exp $
// $Id: biosdev.cc,v 1.9 2004-09-05 17:55:12 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -27,14 +27,14 @@
// Here are the virtual ports use to display messages from the bioses :
//
// 0x0400 : rombios Panic port with message
// 0x0401 : rombios Panic port with line number
// 0x0400 : rombios Panic port with line number
// 0x0401 : rombios Panic port with message, panic flag or line number
// 0x0402 : rombios Info port with message
// 0x0403 : rombios Debug port with message
//
// 0x0500 : vgabios Info port with message
// 0x0501 : vgabios Panic port with message
// 0x0502 : vgabios Panic port with line number
// 0x0501 : vgabios Panic port with line number
// 0x0502 : vgabios Panic port with message, panic flag or line number
// 0x0503 : vgabios Debug port with message
@ -70,11 +70,13 @@ bx_biosdev_c::bx_biosdev_c(void)
bioslog->put("BIOS");
bioslog->settype(BIOSLOG);
s.bios_message_i = 0;
s.bios_panic_flag = 0;
vgabioslog = new logfunctions();
vgabioslog->put("VBIOS");
vgabioslog->settype(BIOSLOG);
s.vgabios_message_i = 0;
s.vgabios_panic_flag = 0;
}
bx_biosdev_c::~bx_biosdev_c(void)
@ -97,13 +99,13 @@ bx_biosdev_c::init(void)
{
DEV_register_iowrite_handler(this, write_handler, 0x0400, "Bios Panic Port 1", 3);
DEV_register_iowrite_handler(this, write_handler, 0x0401, "Bios Panic Port 2", 3);
DEV_register_iowrite_handler(this, write_handler, 0x0403, "Bios Debug Port", 1);
DEV_register_iowrite_handler(this, write_handler, 0x0402, "Bios Info Port", 1);
DEV_register_iowrite_handler(this, write_handler, 0x0403, "Bios Debug Port", 1);
DEV_register_iowrite_handler(this, write_handler, 0x0500, "VGABios Info Port", 1);
DEV_register_iowrite_handler(this, write_handler, 0x0501, "VGABios Panic Port 1", 3);
DEV_register_iowrite_handler(this, write_handler, 0x0502, "VGABios Panic Port 2", 3);
DEV_register_iowrite_handler(this, write_handler, 0x0503, "VGABios Debug Port", 1);
DEV_register_iowrite_handler(this, write_handler, 0x0500, "VGABios Info Port", 1);
}
void
@ -135,15 +137,19 @@ bx_biosdev_c::write(Bit32u address, Bit32u value, unsigned io_len)
switch (address) {
// 0x400-0x401 are used as panic ports for the rombios
case 0x0401:
if (BX_BIOS_THIS s.bios_message_i > 0) {
// if there are bits of message in the buffer, print them as the
// panic message. Otherwise fall into the next case.
if (BX_BIOS_THIS s.bios_message_i >= BX_BIOS_MESSAGE_SIZE)
BX_BIOS_THIS s.bios_message_i = BX_BIOS_MESSAGE_SIZE-1;
if (value==0) {
// The next message sent to the info port will cause a panic
BX_BIOS_THIS s.bios_panic_flag = 1;
break;
} else if (BX_BIOS_THIS s.bios_message_i > 0) {
// if there are bits of message in the buffer, print them as the
// panic message. Otherwise fall into the next case.
if (BX_BIOS_THIS s.bios_message_i >= BX_BIOS_MESSAGE_SIZE)
BX_BIOS_THIS s.bios_message_i = BX_BIOS_MESSAGE_SIZE-1;
BX_BIOS_THIS s.bios_message[ BX_BIOS_THIS s.bios_message_i] = 0;
BX_BIOS_THIS s.bios_message_i = 0;
BX_BIOS_THIS s.bios_message_i = 0;
bioslog->panic("%s", BX_BIOS_THIS s.bios_message);
break;
break;
}
case 0x0400:
bioslog->panic("BIOS panic at rombios.c, line %d", value);
@ -159,31 +165,35 @@ bx_biosdev_c::write(Bit32u address, Bit32u value, unsigned io_len)
if ( BX_BIOS_THIS s.bios_message_i >= BX_BIOS_MESSAGE_SIZE ) {
BX_BIOS_THIS s.bios_message[ BX_BIOS_MESSAGE_SIZE - 1] = 0;
BX_BIOS_THIS s.bios_message_i = 0;
if (address==0x403) bioslog->ldebug("%s", BX_BIOS_THIS s.bios_message);
else bioslog->info("%s", BX_BIOS_THIS s.bios_message);
}
else if ((value & 0xff) == '\n') {
if (address==0x403) bioslog->ldebug("%s", BX_BIOS_THIS s.bios_message);
else bioslog->info("%s", BX_BIOS_THIS s.bios_message);
} else if ((value & 0xff) == '\n') {
BX_BIOS_THIS s.bios_message[ BX_BIOS_THIS s.bios_message_i - 1 ] = 0;
BX_BIOS_THIS s.bios_message_i = 0;
if (address==0x403) bioslog->ldebug("%s", BX_BIOS_THIS s.bios_message);
else bioslog->info("%s", BX_BIOS_THIS s.bios_message);
}
if (BX_BIOS_THIS s.bios_panic_flag==1) bioslog->panic("%s", BX_BIOS_THIS s.bios_message);
else if (address==0x403) bioslog->ldebug("%s", BX_BIOS_THIS s.bios_message);
else bioslog->info("%s", BX_BIOS_THIS s.bios_message);
BX_BIOS_THIS s.bios_panic_flag = 0;
}
break;
// 0x501-0x502 are used as panic ports for the vgabios
case 0x0502:
if (BX_BIOS_THIS s.vgabios_message_i > 0) {
// if there are bits of message in the buffer, print them as the
// panic message. Otherwise fall into the next case.
if (BX_BIOS_THIS s.vgabios_message_i >= BX_BIOS_MESSAGE_SIZE)
BX_BIOS_THIS s.vgabios_message_i = BX_BIOS_MESSAGE_SIZE-1;
if (value==0) {
BX_BIOS_THIS s.vgabios_panic_flag = 1;
break;
} else if (BX_BIOS_THIS s.vgabios_message_i > 0) {
// if there are bits of message in the buffer, print them as the
// panic message. Otherwise fall into the next case.
if (BX_BIOS_THIS s.vgabios_message_i >= BX_BIOS_MESSAGE_SIZE)
BX_BIOS_THIS s.vgabios_message_i = BX_BIOS_MESSAGE_SIZE-1;
BX_BIOS_THIS s.vgabios_message[ BX_BIOS_THIS s.vgabios_message_i] = 0;
BX_BIOS_THIS s.vgabios_message_i = 0;
BX_BIOS_THIS s.vgabios_message_i = 0;
vgabioslog->panic("%s", BX_BIOS_THIS s.vgabios_message);
break;
break;
}
case 0x0501:
vgabioslog->panic("BIOS panic at rombios.c, line %d", value);
vgabioslog->panic("VGABIOS panic at vgabios.c, line %d", value);
break;
// 0x0500 is used as the message port for the vgabios
@ -197,16 +207,17 @@ bx_biosdev_c::write(Bit32u address, Bit32u value, unsigned io_len)
BX_BIOS_THIS s.vgabios_message_i = 0;
if (address==0x503) vgabioslog->ldebug("%s", BX_BIOS_THIS s.vgabios_message);
else vgabioslog->info("%s", BX_BIOS_THIS s.vgabios_message);
}
else if ((value & 0xff) == '\n') {
} else if ((value & 0xff) == '\n') {
BX_BIOS_THIS s.vgabios_message[ BX_BIOS_THIS s.vgabios_message_i - 1 ] = 0;
BX_BIOS_THIS s.vgabios_message_i = 0;
if (address==0x503) vgabioslog->ldebug("%s", BX_BIOS_THIS s.vgabios_message);
if (BX_BIOS_THIS s.vgabios_panic_flag==1) vgabioslog->panic("%s", BX_BIOS_THIS s.vgabios_message);
else if (address==0x503) vgabioslog->ldebug("%s", BX_BIOS_THIS s.vgabios_message);
else vgabioslog->info("%s", BX_BIOS_THIS s.vgabios_message);
}
BX_BIOS_THIS s.vgabios_panic_flag = 0;
}
break;
default:
break;
break;
}
}

4
bochs/iodev/biosdev.h
View File

@ -1,5 +1,5 @@
// $Id: biosdev.h,v 1.3 2002-10-24 21:07:09 bdenney Exp $
// $Id: biosdev.h,v 1.4 2004-09-05 17:55:12 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -55,9 +55,11 @@ private:
struct {
Bit8u bios_message[BX_BIOS_MESSAGE_SIZE];
unsigned int bios_message_i;
bx_bool bios_panic_flag;
Bit8u vgabios_message[BX_BIOS_MESSAGE_SIZE];
unsigned int vgabios_message_i;
bx_bool vgabios_panic_flag;
} s; // state information
};