From 631a80603660f0d8c16d074fa83df45a5250fc4f Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Mon, 28 Dec 2009 20:08:30 +0000 Subject: [PATCH] The EBDA overflow check should not depend on bios_table_cur_addr. - Sebastian --- bochs/bios/rombios32.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bochs/bios/rombios32.c b/bochs/bios/rombios32.c index 574eecc00..c6929836b 100644 --- a/bochs/bios/rombios32.c +++ b/bochs/bios/rombios32.c @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: rombios32.c,v 1.56 2009-12-20 16:43:50 sshwarts Exp $ +// $Id: rombios32.c,v 1.57 2009-12-28 20:08:30 sshwarts Exp $ ///////////////////////////////////////////////////////////////////////// // // 32 bit Bochs BIOS init code @@ -2364,10 +2364,10 @@ void rombios32_init(uint32_t *s3_resume_vector, uint8_t *shutdown_flag) BX_INFO("bios_table_cur_addr: 0x%08lx\n", bios_table_cur_addr); if (bios_table_cur_addr > bios_table_end_addr) BX_PANIC("bios_table_end_addr overflow!\n"); -#ifdef BX_USE_EBDA_TABLES - BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); - if (ebda_cur_addr > 0xA0000) - BX_PANIC("ebda_cur_addr overflow!\n"); -#endif } +#ifdef BX_USE_EBDA_TABLES + BX_INFO("ebda_cur_addr: 0x%08lx\n", ebda_cur_addr); + if (ebda_cur_addr > 0xA0000) + BX_PANIC("ebda_cur_addr overflow!\n"); +#endif }