diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-07-01 15:07:13 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-07-01 15:07:13 -0400 |
| commit | 6bf97032135fcff8eb4993409cef3511db800e6c (patch) | |
| tree | cc109e9d72f0e1bf1dd2489054ac4ca7cae3c474 | |
| parent | 81b57af24118ad61329a848b3b66874e6e05ecb9 (diff) | |
| parent | efd0c5d4b04f630f1b591af509458224b6d98655 (diff) | |
| download | gem5-6bf97032135fcff8eb4993409cef3511db800e6c.tar.xz | |
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision : b421397b21326ec2bdd3ce82b9f69e224b380610
| -rw-r--r-- | dev/ide_atareg.h | 7 | ||||
| -rw-r--r-- | dev/ide_ctrl.cc | 2 | ||||
| -rw-r--r-- | sim/syscall_emul.hh | 3 | ||||
| -rw-r--r-- | sim/system.cc | 5 |
4 files changed, 16 insertions, 1 deletions
diff --git a/dev/ide_atareg.h b/dev/ide_atareg.h index a3a2bd604..5320529c8 100644 --- a/dev/ide_atareg.h +++ b/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 diff --git a/dev/ide_ctrl.cc b/dev/ide_ctrl.cc index 964bd01c2..defeb641b 100644 --- a/dev/ide_ctrl.cc +++ b/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"); diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh index 417531cc3..d061f868e 100644 --- a/sim/syscall_emul.hh +++ b/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" diff --git a/sim/system.cc b/sim/system.cc index 6f7d53f6b..47ffc4b01 100644 --- a/sim/system.cc +++ b/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); |