diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2011-09-30 00:29:07 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2011-09-30 00:29:07 -0700 |
commit | e2dbe59f5dd63ad7a84df701dfbd033320cb8bf9 (patch) | |
tree | 17b37b6883a251c9c3913b61e1ee6896ff407833 /src/dev/mips | |
parent | 91dd72a99a784d4f895ae6e0ff36eed873aab9fe (diff) | |
download | gem5-e2dbe59f5dd63ad7a84df701dfbd033320cb8bf9.tar.xz |
SE/FS: Remove System::platform and Platform::intrFrequency.
In order for a system object to work in SE mode and FS mode, it has to either
always require a platform object even in SE mode, or get rid of the
requirement all together. Making SE mode carry around unnecessary/unused bits
of FS seems less than ideal, so I decided to go with the second option. The
platform pointer in the System class was used for exactly one purpose, a path
for the Alpha Linux system object to get to the real time clock and read its
frequency so that it could short cut the loops_per_jiffy calculation. There
was also a copy and pasted implementation in MIPS, but since it was only there
because it was there in Alpha I still count that as one use.
This change reverses the mechanism that communicates the RTC frequency so that
the Tsunami platform object pushes it up to the AlphaSystem object. This is
slightly less specific than it could be because really only the
AlphaLinuxSystem uses it. Because the intrFrequency function on the Platform
class was no longer necessary (and unimplemented on anything but Alpha) it was
eliminated.
After this change, a platform will need to have a system, but a system won't
have to have a platform.
Diffstat (limited to 'src/dev/mips')
-rwxr-xr-x | src/dev/mips/malta.cc | 11 | ||||
-rwxr-xr-x | src/dev/mips/malta.hh | 6 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/dev/mips/malta.cc b/src/dev/mips/malta.cc index df949c2cf..277633c6b 100755 --- a/src/dev/mips/malta.cc +++ b/src/dev/mips/malta.cc @@ -54,21 +54,10 @@ using namespace TheISA; Malta::Malta(const Params *p) : Platform(p), system(p->system) { -#if FULL_SYSTEM //XXX No platform pointer on the system object in SE mode. - // set the back pointer from the system to myself - system->platform = this; -#endif - for (int i = 0; i < Malta::Max_CPUs; i++) intr_sum_type[i] = 0; } -Tick -Malta::intrFrequency() -{ - return io->frequency(); -} - void Malta::postConsoleInt() { diff --git a/src/dev/mips/malta.hh b/src/dev/mips/malta.hh index 69ae004b3..e612fb295 100755 --- a/src/dev/mips/malta.hh +++ b/src/dev/mips/malta.hh @@ -92,12 +92,6 @@ class Malta : public Platform Malta(const Params *p); /** - * Return the interrupting frequency to MipsAccess - * @return frequency of RTC interrupts - */ - virtual Tick intrFrequency(); - - /** * Cause the cpu to post a serial interrupt to the CPU. */ virtual void postConsoleInt(); |