Merge m5read@m5.eecs.umich.edu:/bk/m5

into zed.eecs.umich.edu:/z/benash/bk/m5

--HG--
extra : convert_revision : b421397b21326ec2bdd3ce82b9f69e224b380610

dev/ide_atareg.h

@@ -33,7 +33,14 @@
 #ifndef _DEV_ATA_ATAREG_H_
 #define _DEV_ATA_ATAREG_H_
 
+#if defined(linux)
+#include <endian.h>
+#else
+#include <machine/endian.h>
+#endif
+
 #define ATA_BYTE_ORDER LITTLE_ENDIAN
+
 /*
  * Drive parameter structure for ATA/ATAPI.
  * Bit fields: WDC_* : common to ATA/ATAPI

dev/ide_ctrl.cc

@@ -103,6 +103,8 @@ IdeController::IdeController(Params *p)
 
     // setup the disks attached to controller
     memset(disks, 0, sizeof(IdeDisk *) * 4);
+    dev[0] = 0;
+    dev[1] = 0;
 
     if (params()->disks.size() > 3)
         panic("IDE controllers support a maximum of 4 devices attached!\n");

sim/syscall_emul.hh

@@ -37,6 +37,9 @@
 
 #include <errno.h>
 #include <string>
+#ifdef __CYGWIN32__
+#include <sys/fcntl.h>	// for O_BINARY
+#endif
 
 #include "base/intmath.hh"	// for RoundUp
 #include "mem/functional/functional.hh"

sim/system.cc

@@ -203,6 +203,8 @@ System::breakpoint()
     return remoteGDB[0]->trap(ALPHA_KENTRY_INT);
 }
 
+int rgdb_wait = -1;
+
 int
 System::registerExecContext(ExecContext *xc, int id)
 {
@@ -229,7 +231,8 @@ System::registerExecContext(ExecContext *xc, int id)
      * Uncommenting this line waits for a remote debugger to connect
      * to the simulator before continuing.
      */
-    //gdbl->accept();
+    if (rgdb_wait != -1 && rgdb_wait == id)
+        gdbl->accept();
 
     if (remoteGDB.size() <= id) {
         remoteGDB.resize(id + 1);