diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-02-19 02:34:52 -0500 |
| commit | 0e4a80df1a471671b6ef7003e29124b6835ade42 (patch) | |
| tree | 1d2c44d8c3462dd94c0fbf6e4f149e026c901aa8 /cpu/base.hh | |
| parent | a48c24b61eedf580645ff0294b225d1e69a9444b (diff) | |
| parent | 463aa6d49d49ba9c383f07207df57bad75c58ec9 (diff) | |
| download | gem5-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 'cpu/base.hh')
| -rw-r--r-- | cpu/base.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu/base.hh b/cpu/base.hh index 09a73ab16..82a47bf4c 100644 --- a/cpu/base.hh +++ b/cpu/base.hh @@ -48,6 +48,7 @@ class ExecContext; class BaseCPU : public SimObject { protected: + typedef TheISA::Addr Addr; // CPU's clock period in terms of the number of ticks of curTime. Tick clock; @@ -58,7 +59,7 @@ class BaseCPU : public SimObject #if FULL_SYSTEM protected: - uint64_t interrupts[NumInterruptLevels]; + uint64_t interrupts[TheISA::NumInterruptLevels]; uint64_t intstatus; public: @@ -68,7 +69,7 @@ class BaseCPU : public SimObject bool checkInterrupts; bool check_interrupt(int int_num) const { - if (int_num > NumInterruptLevels) + if (int_num > TheISA::NumInterruptLevels) panic("int_num out of bounds\n"); return interrupts[int_num] != 0; |