projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a small bug in parameter processing that would always result
[gem5.git]
/
dev
/
alpha_console.hh
diff --git
a/dev/alpha_console.hh
b/dev/alpha_console.hh
index b617b64e77e93710c6fdd912b9e0ca9c7430d86f..49c3a9f78a688e232b8cd000027541ec85cee212 100644
(file)
--- a/
dev/alpha_console.hh
+++ b/
dev/alpha_console.hh
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 200
3
The Regents of The University of Michigan
+ * Copyright (c) 200
1-2004
The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-37,11
+37,12
@@
#include "dev/alpha_access.h"
#include "dev/io_device.hh"
#include "sim/host.hh"
#include "dev/alpha_access.h"
#include "dev/io_device.hh"
#include "sim/host.hh"
+#include "sim/sim_object.hh"
class BaseCPU;
class SimConsole;
class System;
class BaseCPU;
class SimConsole;
class System;
-class
TlaserClock
;
+class
Platform
;
class SimpleDisk;
/*
class SimpleDisk;
/*
@@
-74,7
+75,7
@@
class AlphaConsole : public PioDevice
protected:
union {
AlphaAccess *alphaAccess;
protected:
union {
AlphaAccess *alphaAccess;
-
uint8_t *consoleData;
+ uint8_t *consoleData;
};
/** the disk must be accessed from the console */
};
/** the disk must be accessed from the console */
@@
-89,7
+90,7
@@
class AlphaConsole : public PioDevice
public:
/** Standard Constructor */
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
public:
/** Standard Constructor */
AlphaConsole(const std::string &name, SimConsole *cons, SimpleDisk *d,
- System *system, BaseCPU *cpu,
TlaserClock *clock
,
+ System *system, BaseCPU *cpu,
Platform *platform
,
int num_cpus, MemoryController *mmu, Addr addr,
HierParams *hier, Bus *bus);
int num_cpus, MemoryController *mmu, Addr addr,
HierParams *hier, Bus *bus);