sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

--HG--
extra : convert_revision : b421397b21326ec2bdd3ce82b9f69e224b380610
This commit is contained in:
Benjamin Nash 2005-07-01 15:07:13 -04:00
commit 6bf9703213
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dev/ide_atareg.h
View file

@ -33,7 +33,14 @@
#ifndef _DEV_ATA_ATAREG_H_ #ifndef _DEV_ATA_ATAREG_H_
#define _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 #define ATA_BYTE_ORDER LITTLE_ENDIAN
/* /*
* Drive parameter structure for ATA/ATAPI. * Drive parameter structure for ATA/ATAPI.
* Bit fields: WDC_* : common to ATA/ATAPI * Bit fields: WDC_* : common to ATA/ATAPI

2
dev/ide_ctrl.cc
View file

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

3
sim/syscall_emul.hh
View file

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

5
sim/system.cc
View file

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