projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
[gem5.git]
/
dev
/
alpha_console.hh
diff --git
a/dev/alpha_console.hh
b/dev/alpha_console.hh
index 47afa8f4a333383dbefce65db306e0963b1ccc25..49c3a9f78a688e232b8cd000027541ec85cee212 100644
(file)
--- a/
dev/alpha_console.hh
+++ b/
dev/alpha_console.hh
@@
-73,7
+73,10
@@
class SimpleDisk;
class AlphaConsole : public PioDevice
{
protected:
+ union {
AlphaAccess *alphaAccess;
+ uint8_t *consoleData;
+ };
/** the disk must be accessed from the console */
SimpleDisk *disk;