isa.hh (10935:acd48ddd725f) isa.hh (11165:d90aec9435bd)
1/*
2 * Copyright (c) 2010, 2012-2015 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 36 unchanged lines hidden (view full) ---

45
46#include "arch/arm/isa_device.hh"
47#include "arch/arm/registers.hh"
48#include "arch/arm/system.hh"
49#include "arch/arm/tlb.hh"
50#include "arch/arm/types.hh"
51#include "debug/Checkpoint.hh"
52#include "sim/sim_object.hh"
1/*
2 * Copyright (c) 2010, 2012-2015 ARM Limited
3 * All rights reserved
4 *
5 * The license below extends only to copyright in the software and shall
6 * not be construed as granting a license to any other intellectual
7 * property including but not limited to intellectual property relating
8 * to a hardware implementation of the functionality of the software

--- 36 unchanged lines hidden (view full) ---

45
46#include "arch/arm/isa_device.hh"
47#include "arch/arm/registers.hh"
48#include "arch/arm/system.hh"
49#include "arch/arm/tlb.hh"
50#include "arch/arm/types.hh"
51#include "debug/Checkpoint.hh"
52#include "sim/sim_object.hh"
53#include "enums/DecoderFlavour.hh"
53
54struct ArmISAParams;
55struct DummyArmISADeviceParams;
56class ThreadContext;
57class Checkpoint;
58class EventManager;
59
60namespace ArmISA

--- 66 unchanged lines hidden (view full) ---

127 };
128
129 class ISA : public SimObject
130 {
131 protected:
132 // Parent system
133 ArmSystem *system;
134
54
55struct ArmISAParams;
56struct DummyArmISADeviceParams;
57class ThreadContext;
58class Checkpoint;
59class EventManager;
60
61namespace ArmISA

--- 66 unchanged lines hidden (view full) ---

128 };
129
130 class ISA : public SimObject
131 {
132 protected:
133 // Parent system
134 ArmSystem *system;
135
136 // Micro Architecture
137 const Enums::DecoderFlavour _decoderFlavour;
138
135 /** Dummy device for to handle non-existing ISA devices */
136 DummyISADevice dummyDevice;
137
138 // PMU belonging to this ISA
139 BaseISADevice *pmu;
140
141 // Generic timer interface belonging to this ISA
142 std::unique_ptr<BaseISADevice> timer;

--- 281 unchanged lines hidden (view full) ---

424 UNSERIALIZE_SCALAR(haveLPAE);
425 UNSERIALIZE_SCALAR(haveVirtualization);
426 UNSERIALIZE_SCALAR(haveLargeAsid64);
427 UNSERIALIZE_SCALAR(physAddrRange64);
428 }
429
430 void startup(ThreadContext *tc) {}
431
139 /** Dummy device for to handle non-existing ISA devices */
140 DummyISADevice dummyDevice;
141
142 // PMU belonging to this ISA
143 BaseISADevice *pmu;
144
145 // Generic timer interface belonging to this ISA
146 std::unique_ptr<BaseISADevice> timer;

--- 281 unchanged lines hidden (view full) ---

428 UNSERIALIZE_SCALAR(haveLPAE);
429 UNSERIALIZE_SCALAR(haveVirtualization);
430 UNSERIALIZE_SCALAR(haveLargeAsid64);
431 UNSERIALIZE_SCALAR(physAddrRange64);
432 }
433
434 void startup(ThreadContext *tc) {}
435
436 Enums::DecoderFlavour decoderFlavour() const { return _decoderFlavour; }
437
432 /// Explicitly import the otherwise hidden startup
433 using SimObject::startup;
434
435 typedef ArmISAParams Params;
436
437 const Params *params() const;
438
439 ISA(Params *p);
440 };
441}
442
443#endif
438 /// Explicitly import the otherwise hidden startup
439 using SimObject::startup;
440
441 typedef ArmISAParams Params;
442
443 const Params *params() const;
444
445 ISA(Params *p);
446 };
447}
448
449#endif