diff options
Diffstat (limited to 'src/cpu/simple/atomic.hh')
-rw-r--r-- | src/cpu/simple/atomic.hh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh index 126cd3765..c0112836a 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -1,4 +1,16 @@ /* + * Copyright (c) 2012 ARM Limited + * All rights reserved. + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * * Copyright (c) 2002-2005 The Regents of The University of Michigan * All rights reserved. * @@ -90,8 +102,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU AtomicCPUPort icachePort; AtomicCPUPort dcachePort; - CpuPort physmemPort; - bool hasPhysMemPort; + bool fastmem; Request ifetch_req; Request data_read_req; Request data_write_req; @@ -111,13 +122,6 @@ class AtomicSimpleCPU : public BaseSimpleCPU public: - /** - * Override the getMasterPort of the BaseCPU so that we can - * provide the physmemPort, unique to the Atomic CPU. - */ - virtual MasterPort &getMasterPort(const std::string &if_name, - int idx = -1); - virtual void serialize(std::ostream &os); virtual void unserialize(Checkpoint *cp, const std::string §ion); virtual void resume(); |