projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ktlim@zizzer:/bk/m5
[gem5.git]
/
arch
/
alpha
/
arguments.cc
diff --git
a/arch/alpha/arguments.cc
b/arch/alpha/arguments.cc
index 2dca3f51e027d9c1408f1d36f8ea8614c4a5ce5c..019390aeb40bfc929105c7a06629a5953274dc9b 100644
(file)
--- a/
arch/alpha/arguments.cc
+++ b/
arch/alpha/arguments.cc
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003
-2005
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
@@
-26,10
+26,12
@@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "arch/alpha/arguments.hh"
+#include "arch/alpha/vtophys.hh"
#include "cpu/exec_context.hh"
#include "cpu/exec_context.hh"
-#include "mem/functional
_mem/physical_memory
.hh"
-#include "targetarch/arguments.hh"
-#include "targetarch/vtophys.hh"
+#include "mem/functional
/physical
.hh"
+
+using namespace AlphaISA;
AlphaArguments::Data::~Data()
{
AlphaArguments::Data::~Data()
{
@@
-52,13
+54,13
@@
AlphaArguments::getArg(bool fp)
{
if (number < 6) {
if (fp)
{
if (number < 6) {
if (fp)
- return xc->re
gs.floatRegFile.q[16 + number]
;
+ return xc->re
adFloatRegInt(16 + number)
;
else
else
- return xc->re
gs.intRegFile[16 + number]
;
+ return xc->re
adIntReg(16 + number)
;
} else {
} else {
- Addr sp = xc->re
gs.intRegFile[30]
;
+ Addr sp = xc->re
adIntReg(30)
;
Addr paddr = vtophys(xc, sp + (number-6) * sizeof(uint64_t));
Addr paddr = vtophys(xc, sp + (number-6) * sizeof(uint64_t));
- return xc->
physmem
->phys_read_qword(paddr);
+ return xc->
getPhysMemPtr()
->phys_read_qword(paddr);
}
}
}
}