summaryrefslogtreecommitdiff
path: root/kern/kernel_stats.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-19 02:34:52 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-19 02:34:52 -0500
commit0e4a80df1a471671b6ef7003e29124b6835ade42 (patch)
tree1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /kern/kernel_stats.hh
parenta48c24b61eedf580645ff0294b225d1e69a9444b (diff)
parent463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff)
downloadgem5-0e4a80df1a471671b6ef7003e29124b6835ade42.tar.xz
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch --HG-- extra : convert_revision : 090b30a7f70294e1aeb13ba0bc15da4061bdf348
Diffstat (limited to 'kern/kernel_stats.hh')
-rw-r--r--kern/kernel_stats.hh7
1 files changed, 6 insertions, 1 deletions
diff --git a/kern/kernel_stats.hh b/kern/kernel_stats.hh
index 98cc044ac..e4d5ec011 100644
--- a/kern/kernel_stats.hh
+++ b/kern/kernel_stats.hh
@@ -50,6 +50,8 @@ extern const char *modestr[];
class Binning
{
+ protected:
+ typedef TheISA::Addr Addr;
private:
std::string myname;
System *system;
@@ -106,7 +108,7 @@ class Binning
cpu_mode themode;
void palSwapContext(ExecContext *xc);
- void execute(ExecContext *xc, StaticInstPtr<TheISA> inst);
+ void execute(ExecContext *xc, StaticInstPtr inst);
void call(ExecContext *xc, Stats::MainBin *myBin);
void changeMode(cpu_mode mode);
@@ -124,6 +126,9 @@ class Binning
class Statistics : public Serializable
{
+ protected:
+ typedef TheISA::Addr Addr;
+ private:
friend class Binning;
private: