Took the Alpha prefix off of AlphaArguments, and made sure it was being used from...

--HG--
extra : convert_revision : 17c143d3cbc2f58a7a9d01366a8f649810ff7f33

diff --git a/src/arch/alpha/arguments.cc b/src/arch/alpha/arguments.cc
index 9f9002003683397aab89aee17dd9aeb5971db32d..e89bd70b09fe82aba3ff5b5fbe4160d5dc39cc84 100644 (file)
--- a/src/arch/alpha/arguments.cc
+++ b/src/arch/alpha/arguments.cc
@@ -35,7 +35,7 @@
 
 using namespace AlphaISA;
 
-AlphaArguments::Data::~Data()
+Arguments::Data::~Data()
 {
     while (!data.empty()) {
         delete [] data.front();
@@ -44,7 +44,7 @@ AlphaArguments::Data::~Data()
 }
 
 char *
-AlphaArguments::Data::alloc(size_t size)
+Arguments::Data::alloc(size_t size)
 {
     char *buf = new char[size];
     data.push_back(buf);
@@ -52,7 +52,7 @@ AlphaArguments::Data::alloc(size_t size)
 }
 
 uint64_t
-AlphaArguments::getArg(bool fp)
+Arguments::getArg(bool fp)
 {
     if (number < 6) {
         if (fp)

diff --git a/src/arch/alpha/arguments.hh b/src/arch/alpha/arguments.hh
index d977d48d6a08c3084dc9a356daf81b6eb0d1c483..c44181a8d2ac1875a60e4a10ba29d6ee23865d91 100644 (file)
--- a/src/arch/alpha/arguments.hh
+++ b/src/arch/alpha/arguments.hh
@@ -41,7 +41,7 @@ class ThreadContext;
 
 namespace AlphaISA {
 
-class AlphaArguments
+class Arguments
 {
   protected:
     ThreadContext *tc;
@@ -65,62 +65,62 @@ class AlphaArguments
     RefCountingPtr<Data> data;
 
   public:
-    AlphaArguments(ThreadContext *ctx, int n = 0)
+    Arguments(ThreadContext *ctx, int n = 0)
         : tc(ctx), number(n), data(NULL)
         { assert(number >= 0); data = new Data;}
-    AlphaArguments(const AlphaArguments &args)
+    Arguments(const Arguments &args)
         : tc(args.tc), number(args.number), data(args.data) {}
-    ~AlphaArguments() {}
+    ~Arguments() {}
 
     ThreadContext *getThreadContext() const { return tc; }
 
-    const AlphaArguments &operator=(const AlphaArguments &args) {
+    const Arguments &operator=(const Arguments &args) {
         tc = args.tc;
         number = args.number;
         data = args.data;
         return *this;
     }
 
-    AlphaArguments &operator++() {
+    Arguments &operator++() {
         ++number;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator++(int) {
-        AlphaArguments args = *this;
+    Arguments operator++(int) {
+        Arguments args = *this;
         ++number;
         assert(number >= 0);
         return args;
     }
 
-    AlphaArguments &operator--() {
+    Arguments &operator--() {
         --number;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator--(int) {
-        AlphaArguments args = *this;
+    Arguments operator--(int) {
+        Arguments args = *this;
         --number;
         assert(number >= 0);
         return args;
     }
 
-    const AlphaArguments &operator+=(int index) {
+    const Arguments &operator+=(int index) {
         number += index;
         assert(number >= 0);
         return *this;
     }
 
-    const AlphaArguments &operator-=(int index) {
+    const Arguments &operator-=(int index) {
         number -= index;
         assert(number >= 0);
         return *this;
     }
 
-    AlphaArguments operator[](int index) {
-        return AlphaArguments(tc, index);
+    Arguments operator[](int index) {
+        return Arguments(tc, index);
     }
 
     template <class T>

diff --git a/src/kern/linux/events.cc b/src/kern/linux/events.cc
index 289ece5cea3261ed76154117642d18fe585c026d..ba52e040ae9ce52b6eaa1d38eb5172da73ae29f6 100644 (file)
--- a/src/kern/linux/events.cc
+++ b/src/kern/linux/events.cc
@@ -49,7 +49,7 @@ DebugPrintkEvent::process(ThreadContext *tc)
             DPRINTFN("");
         }
 
-        AlphaISA::AlphaArguments args(tc);
+        TheISA::Arguments args(tc);
         Printk(args);
         SkipFuncEvent::process(tc);
     }

diff --git a/src/kern/linux/printk.cc b/src/kern/linux/printk.cc
index 004d1be2f71d59df6f4b37a980ee9ed8ac1e79fe..ea3d59f19bb77431638858f74613fc059b740941 100644 (file)
--- a/src/kern/linux/printk.cc
+++ b/src/kern/linux/printk.cc
@@ -39,7 +39,7 @@ using namespace std;
 
 
 void
-Printk(AlphaISA::AlphaArguments args)
+Printk(TheISA::Arguments args)
 {
     char *p = (char *)args++;
 

diff --git a/src/kern/linux/printk.hh b/src/kern/linux/printk.hh
index 5ddf0a018d1e09278398f3f9c8324caba256e845..17d59b765f05ff7a8930a34cdf88ea9b89070ae3 100644 (file)
--- a/src/kern/linux/printk.hh
+++ b/src/kern/linux/printk.hh
@@ -32,8 +32,10 @@
 #ifndef __PRINTK_HH__
 #define __PRINTK_HH__
 
-class AlphaISA::AlphaArguments;
+#include "arch/isa_specific.hh"
 
-void Printk(AlphaISA::AlphaArguments args);
+class TheISA::Arguments;
+
+void Printk(TheISA::Arguments args);
 
 #endif // __PRINTK_HH__

diff --git a/src/kern/tru64/dump_mbuf.cc b/src/kern/tru64/dump_mbuf.cc
index 8f88f8904df07280aadc2fbc101880ee1bda20ad..22d2228f078826241baf69cade488c8a136565ac 100644 (file)
--- a/src/kern/tru64/dump_mbuf.cc
+++ b/src/kern/tru64/dump_mbuf.cc
@@ -47,7 +47,7 @@ using namespace TheISA;
 namespace tru64 {
 
 void
-DumpMbuf(AlphaArguments args)
+DumpMbuf(Arguments args)
 {
     ThreadContext *tc = args.getThreadContext();
     Addr addr = (Addr)args;

diff --git a/src/kern/tru64/dump_mbuf.hh b/src/kern/tru64/dump_mbuf.hh
index 25c6fd31d0cfa00a0da3d8067c261d317f02cf7f..30b1102b9ff4887d7374fe32d05f78cca54d6019 100644 (file)
--- a/src/kern/tru64/dump_mbuf.hh
+++ b/src/kern/tru64/dump_mbuf.hh
@@ -34,7 +34,7 @@
 #include "arch/arguments.hh"
 
 namespace tru64 {
-    void DumpMbuf(AlphaISA::AlphaArguments args);
+    void DumpMbuf(TheISA::Arguments args);
 }
 
 #endif // __DUMP_MBUF_HH__

diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 29dd443d2ad0f717cc185ce46dca1c170b43f626..2c767c4d2f308ef592ccfc2f2f793350d7361271 100644 (file)
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -42,7 +42,7 @@ using namespace std;
 namespace tru64 {
 
 void
-Printf(AlphaISA::AlphaArguments args)
+Printf(TheISA::Arguments args)
 {
     char *p = (char *)args++;
 

diff --git a/src/kern/tru64/printf.hh b/src/kern/tru64/printf.hh
index f6a4544ad012987265ae7694c7315983bc1ec931..ff453b1c12444dfd2c67707675e93f6947db212a 100644 (file)
--- a/src/kern/tru64/printf.hh
+++ b/src/kern/tru64/printf.hh
@@ -34,7 +34,7 @@
 #include "arch/arguments.hh"
 
 namespace tru64 {
-    void Printf(AlphaISA::AlphaArguments args);
+    void Printf(TheISA::Arguments args);
 }
 
 #endif // __PRINTF_HH__

diff --git a/src/kern/tru64/tru64_events.cc b/src/kern/tru64/tru64_events.cc
index 69638bde1d666679bff05cfb0994820ab38c3017..851b3a526078748dc41a5b2bc27024cfc41fda55 100644 (file)
--- a/src/kern/tru64/tru64_events.cc
+++ b/src/kern/tru64/tru64_events.cc
@@ -81,7 +81,7 @@ PrintfEvent::process(ThreadContext *tc)
     if (DTRACE(Printf)) {
         DebugOut() << curTick << ": " << tc->getCpuPtr()->name() << ": ";
 
-        AlphaArguments args(tc);
+        Arguments args(tc);
         tru64::Printf(args);
     }
 }
@@ -93,7 +93,7 @@ DebugPrintfEvent::process(ThreadContext *tc)
         if (!raw)
             DebugOut() << curTick << ": " << tc->getCpuPtr()->name() << ": ";
 
-        AlphaArguments args(tc);
+        Arguments args(tc);
         tru64::Printf(args);
     }
 }
@@ -102,7 +102,7 @@ void
 DumpMbufEvent::process(ThreadContext *tc)
 {
     if (DTRACE(DebugPrintf)) {
-        AlphaArguments args(tc);
+        Arguments args(tc);
         tru64::DumpMbuf(args);
     }
 }