Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : f149b8ea762d4a83ef76b3bb95f28e0709391ecf

1 files changed, 4 insertions, 2 deletions

diff --git a/sim/process.hh b/sim/process.hh
index 817ab656c..3bcc65da6 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -93,7 +93,8 @@ class Process : public SimObject
     Addr next_thread_stack_base;
 
     // Base of region for mmaps (when user doesn't specify an address).
-    Addr mmap_base;
+    Addr mmap_start;
+    Addr mmap_end;
 
     std::string prog_fname;	// file name
     Addr prog_entry;		// entry point (initial PC)
@@ -158,7 +159,8 @@ class Process : public SimObject
     {
         return ((data_base <= addr && addr < brk_point) ||
                 ((stack_base - 16*1024*1024) <= addr && addr < stack_base) ||
-                (text_base <= addr && addr < (text_base + text_size)));
+                (text_base <= addr && addr < (text_base + text_size)) ||
+                (mmap_start <= addr && addr < mmap_end));
     }
 
     virtual void syscall(ExecContext *xc) = 0;