From de527e2dde4a132def961916e60c1e8376b0024c Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Sun, 6 Mar 2005 21:23:38 +0000
Subject: [PATCH] Do not allow to allocate more than 2048Mb of emulated memory.
 Anyway in most of systems it fails to allocated even 1024Mb and allocating
 more than 4096Mb causes overlap and unpredicted behaviour.

---
 bochs/.bochsrc     | 5 +++--
 bochs/README       | 8 ++++----
 bochs/TESTFORM.txt | 3 +--
 bochs/config.cc    | 4 ++--
 bochs/config.h.in  | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bochs/.bochsrc b/bochs/.bochsrc
index cceef4fd6..48a2b7206 100644
--- a/bochs/.bochsrc
+++ b/bochs/.bochsrc
@@ -77,8 +77,9 @@ romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
 
 #=======================================================================
 # MEGS
-# set this to the default number of Megabytes of memory you want
-# to emulate. The default is 32MB, most OS's won't need more than that. 
+# Set the number of Megabytes of physical memory you want to emulate. 
+# The default is 32MB, most OS's won't need more than that.
+# The maximum amount of memory supported is 2048Mb.
 #=======================================================================
 #megs: 256
 #megs: 128
diff --git a/bochs/README b/bochs/README
index f6bcb89cf..6bbf3daa3 100644
--- a/bochs/README
+++ b/bochs/README
@@ -9,9 +9,9 @@ written in C++, that runs on most popular platforms.  It includes
 emulation of the Intel x86 CPU, common I/O devices, and a custom
 BIOS.  Currently, Bochs can be compiled to emulate a 386, 486,
 Pentium, Pentium Pro or AMD64 CPU, including optional MMX, SSE, 
-SSE2 and 3DNow instructions.  Bochs is capable of running most 
-Operating Systems inside the emulation including Linux, Windows 95, 
-DOS, and Windows NT 4.  
+SSE2 and 3DNow! instructions.  Bochs is capable of running most 
+Operating Systems inside the emulation including Linux, DOS,
+Windows 95/98 and Windows NT/2000.  
 Bochs was written by Kevin Lawton and is currently maintained by 
 the Bochs project at "http://bochs.sourceforge.net".
 
@@ -20,7 +20,7 @@ still in development.  The 'typical' use of bochs is to provide
 complete x86 PC emulation, including the x86 processor, hardware
 devices, and memory.  This allows you to run OS's and software within
 the emulator on your workstation, much like you have a machine
-inside of a machine.  Bochs will allow you to run Win '95
+inside of a machine.  Bochs will allow you to run Windows
 applications on a Solaris machine with X11, for example.
 
 Bochs is distributed under the GNU LGPL.  See COPYING for details.
diff --git a/bochs/TESTFORM.txt b/bochs/TESTFORM.txt
index bfba340d8..65e35f93d 100644
--- a/bochs/TESTFORM.txt
+++ b/bochs/TESTFORM.txt
@@ -41,8 +41,7 @@ Redhat Linux 6.2 with 2.2.16 kernel.
 [__]
 
 What version of bochs are you using?
-   [ ] compiled from version 1.4.1
-   [ ] compiled from version 2.0
+   [ ] compiled from version 2.1.1
    [ ] compiled from version [_____]
    [ ] I compiled it from the CVS sources from date: [__]
    [ ] other source distribution from URL: [__]
diff --git a/bochs/config.cc b/bochs/config.cc
index a2ae07309..dd1f29df4 100755
--- a/bochs/config.cc
+++ b/bochs/config.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: config.cc,v 1.30 2005-02-01 19:16:19 vruppert Exp $
+// $Id: config.cc,v 1.31 2005-03-06 21:23:38 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -818,7 +818,7 @@ void bx_init_options ()
   bx_options.memory.Osize = new bx_param_num_c (BXP_MEM_SIZE,
       "megs",
       "Amount of RAM in megabytes",
-      1, BX_MAX_BIT32U,
+      1, 2048,
       BX_DEFAULT_MEM_MEGS);
   bx_options.memory.Osize->set_ask_format ("Enter memory size (MB): [%d] ");
 #if BX_WITH_WX
diff --git a/bochs/config.h.in b/bochs/config.h.in
index e85bb05f9..f3e576f46 100644
--- a/bochs/config.h.in
+++ b/bochs/config.h.in
@@ -157,7 +157,7 @@
 // 'megs:' directive in the '.bochsrc' file overrides this,
 // allowing per-run settings.
 
-#define BX_DEFAULT_MEM_MEGS 4
+#define BX_DEFAULT_MEM_MEGS 32
 
 
 // CPU level emulation.  Default level is set in