Changes to support automatic renaming of the shadow registers at decode time. This...

[gem5.git] / arch / alpha / arguments.hh

diff --git a/arch/alpha/arguments.hh b/arch/alpha/arguments.hh
index c5fdb60ad1b079fd85de9c5acf46279ed89f40c6..75346bf58bedeafc2164b420d80d3f6a83e4300f 100644 (file)
--- a/arch/alpha/arguments.hh
+++ b/arch/alpha/arguments.hh
@@ -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
@@ -31,9 +31,9 @@
 
 #include <assert.h>
 
-#include "host.hh"
-#include "kernel.hh"
-#include "refcnt.hh"
+#include "arch/alpha/vtophys.hh"
+#include "base/refcnt.hh"
+#include "sim/host.hh"
 
 class ExecContext;
 
@@ -129,13 +129,13 @@ class AlphaArguments
     template <class T>
     operator T *() {
         T *buf = (T *)data->alloc(sizeof(T));
-        Kernel::CopyData(xc, buf, getArg(), sizeof(T));
+        CopyData(xc, buf, getArg(), sizeof(T));
         return buf;
     }
 
     operator char *() {
         char *buf = data->alloc(2048);
-        Kernel::CopyString(xc, buf, getArg(), 2048);
+        CopyString(xc, buf, getArg(), 2048);
         return buf;
     }
 };