diff options
| author | Gabe Black <gabeblack@google.com> | 2018-01-08 19:07:21 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-01-11 09:34:23 +0000 |
| commit | f96e542dd88762556bda357fe046318ccf31268f (patch) | |
| tree | 529fca01d8f79efc9bda988759b83614aa80bdbf | |
| parent | ad0056d2e811284870edcc5350db9fa3dbff6f2e (diff) | |
| download | gem5-f96e542dd88762556bda357fe046318ccf31268f.tar.xz | |
arm, power: Make the python TLB simobjects inherit from BaseTLB.
These were still inheriting from SimObject instead of BaseTLB, making
them incompatible with parameters which expect a BaseTLB.
Change-Id: I05115cc5515f745fdeb85e4dea8eded613647e40
Reviewed-on: https://gem5-review.googlesource.com/7348
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
| -rw-r--r-- | src/arch/arm/ArmTLB.py | 3 | ||||
| -rw-r--r-- | src/arch/power/PowerTLB.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/arch/arm/ArmTLB.py b/src/arch/arm/ArmTLB.py index b3f711d83..4cac944f1 100644 --- a/src/arch/arm/ArmTLB.py +++ b/src/arch/arm/ArmTLB.py @@ -41,6 +41,7 @@ from m5.SimObject import SimObject from m5.params import * from m5.proxy import * from MemObject import MemObject +from BaseTLB import BaseTLB # Basic stage 1 translation objects class ArmTableWalker(MemObject): @@ -59,7 +60,7 @@ class ArmTableWalker(MemObject): sys = Param.System(Parent.any, "system object parameter") -class ArmTLB(SimObject): +class ArmTLB(BaseTLB): type = 'ArmTLB' cxx_class = 'ArmISA::TLB' cxx_header = "arch/arm/tlb.hh" diff --git a/src/arch/power/PowerTLB.py b/src/arch/power/PowerTLB.py index ae6503a1f..b12c5a8e3 100644 --- a/src/arch/power/PowerTLB.py +++ b/src/arch/power/PowerTLB.py @@ -31,7 +31,9 @@ from m5.SimObject import SimObject from m5.params import * -class PowerTLB(SimObject): +from BaseTLB import BaseTLB + +class PowerTLB(BaseTLB): type = 'PowerTLB' cxx_class = 'PowerISA::TLB' cxx_header = 'arch/power/tlb.hh' |