From 42ad2eaa1ef4ac85a7df1dbd84a75bb3e376c5a6 Mon Sep 17 00:00:00 2001
From: Christophe Bothamy <cbbochs@free.fr>
Date: Wed, 6 Aug 2003 08:24:14 +0000
Subject: [PATCH] - fix Bochs failing to panic when BIOS images can not be
 loaded

---
 bochs/memory/misc_mem.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc
index f0c32334e..8f25e8822 100644
--- a/bochs/memory/misc_mem.cc
+++ b/bochs/memory/misc_mem.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: misc_mem.cc,v 1.39 2003-08-05 13:19:35 cbothamy Exp $
+// $Id: misc_mem.cc,v 1.40 2003-08-06 08:24:14 cbothamy Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -129,7 +129,7 @@ BX_MEM_C::~BX_MEM_C(void)
   void
 BX_MEM_C::init_memory(int memsize)
 {
-  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.39 2003-08-05 13:19:35 cbothamy Exp $"));
+  BX_DEBUG(("Init $Id: misc_mem.cc,v 1.40 2003-08-06 08:24:14 cbothamy Exp $"));
   // you can pass 0 if memory has been allocated already through
   // the constructor, or the desired size of memory if it hasn't
   // BX_INFO(("%.2fMB", (float)(BX_MEM_THIS megabytes) ));
@@ -155,6 +155,10 @@ BX_MEM_C::init_memory(int memsize)
 
 #if BX_PROVIDE_CPU_MEMORY
   void
+  // Values for type :
+  // 0 : System Bios
+  // 1 : VGA Bios
+  // 2 : Optional ROM Bios
 BX_MEM_C::load_ROM(const char *path, Bit32u romaddress, Bit8u type)
 {
   struct stat stat_buf;
@@ -180,7 +184,7 @@ BX_MEM_C::load_ROM(const char *path, Bit32u romaddress, Bit8u type)
 #endif
            );
   if (fd < 0) {
-    if (type > 0) {
+    if (type < 2) {
       BX_PANIC(( "ROM: couldn't open ROM image file '%s'.", path));
       }
     else {
@@ -190,7 +194,7 @@ BX_MEM_C::load_ROM(const char *path, Bit32u romaddress, Bit8u type)
     }
   ret = fstat(fd, &stat_buf);
   if (ret) {
-    if (type > 0) {
+    if (type < 2) {
       BX_PANIC(( "ROM: couldn't stat ROM image file '%s'.", path));
       }
     else {