summaryrefslogtreecommitdiff
path: root/src/learning_gem5/part2/simple_memobj.hh
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-09-06 16:31:13 -0700
committerGabe Black <gabeblack@google.com>2019-09-09 01:54:36 +0000
commit37551510ea4b4b4eca16785393f7b17abd50f00e (patch)
tree690a00d6fdd4ff952b2121822b508d0ac90d79ac /src/learning_gem5/part2/simple_memobj.hh
parent286b6267afde29fcbe7d6aa3950ded6dba9eda1e (diff)
downloadgem5-37551510ea4b4b4eca16785393f7b17abd50f00e.tar.xz
dev: Scrub out some lingering uses of MemObject.
MemObject doesn't do anything any more, and is basically just an alias for ClockedObject. Change-Id: Ic0e1658609e4e1d7f4b829fbc421f222e4869dee Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20719 Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Gabe Black <gabeblack@google.com> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/learning_gem5/part2/simple_memobj.hh')
-rw-r--r--src/learning_gem5/part2/simple_memobj.hh5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/learning_gem5/part2/simple_memobj.hh b/src/learning_gem5/part2/simple_memobj.hh
index 7a9b44764..c08f98e93 100644
--- a/src/learning_gem5/part2/simple_memobj.hh
+++ b/src/learning_gem5/part2/simple_memobj.hh
@@ -31,8 +31,9 @@
#ifndef __LEARNING_GEM5_PART2_SIMPLE_MEMOBJ_HH__
#define __LEARNING_GEM5_PART2_SIMPLE_MEMOBJ_HH__
-#include "mem/mem_object.hh"
+#include "mem/port.hh"
#include "params/SimpleMemobj.hh"
+#include "sim/sim_object.hh"
/**
* A very simple memory object. Current implementation doesn't even cache
@@ -40,7 +41,7 @@
* This memobj is fully blocking (not non-blocking). Only a single request can
* be outstanding at a time.
*/
-class SimpleMemobj : public MemObject
+class SimpleMemobj : public SimObject
{
private: