base.hh (8557:f44572edfba3) base.hh (8733:64a7bf8fa56c)
1/*
1/*
2 * Copyright (c) 2011 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
9 * licensed hereunder. You may use the software subject to the license
10 * terms below provided that you ensure that this notice is replicated
11 * unmodified and in its entirety in all distributions of the software,
12 * modified or unmodified, in source code or in binary form.
13 *
2 * Copyright (c) 2002-2005 The Regents of The University of Michigan
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are
7 * met: redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer;
9 * redistributions in binary form must reproduce the above copyright

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

32
33#ifndef __CPU_SIMPLE_BASE_HH__
34#define __CPU_SIMPLE_BASE_HH__
35
36#include "arch/predecoder.hh"
37#include "base/statistics.hh"
38#include "config/full_system.hh"
39#include "config/the_isa.hh"
14 * Copyright (c) 2002-2005 The Regents of The University of Michigan
15 * All rights reserved.
16 *
17 * Redistribution and use in source and binary forms, with or without
18 * modification, are permitted provided that the following conditions are
19 * met: redistributions of source code must retain the above copyright
20 * notice, this list of conditions and the following disclaimer;
21 * redistributions in binary form must reproduce the above copyright

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

44
45#ifndef __CPU_SIMPLE_BASE_HH__
46#define __CPU_SIMPLE_BASE_HH__
47
48#include "arch/predecoder.hh"
49#include "base/statistics.hh"
50#include "config/full_system.hh"
51#include "config/the_isa.hh"
52#include "config/use_checker.hh"
40#include "cpu/base.hh"
41#include "cpu/decode.hh"
42#include "cpu/pc_event.hh"
43#include "cpu/simple_thread.hh"
44#include "cpu/static_inst.hh"
45#include "mem/packet.hh"
46#include "mem/port.hh"
47#include "mem/request.hh"
48#include "sim/eventq.hh"
49#include "sim/system.hh"
50
53#include "cpu/base.hh"
54#include "cpu/decode.hh"
55#include "cpu/pc_event.hh"
56#include "cpu/simple_thread.hh"
57#include "cpu/static_inst.hh"
58#include "mem/packet.hh"
59#include "mem/port.hh"
60#include "mem/request.hh"
61#include "sim/eventq.hh"
62#include "sim/system.hh"
63
64#if USE_CHECKER
65#include "cpu/checker/cpu.hh"
66#endif
67
51// forward declarations
52#if FULL_SYSTEM
53class Processor;
54namespace TheISA
55{
56 class ITB;
57 class DTB;
58}

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

115 public:
116 /** SimpleThread object, provides all the architectural state. */
117 SimpleThread *thread;
118
119 /** ThreadContext object, provides an interface for external
120 * objects to modify this thread's state.
121 */
122 ThreadContext *tc;
68// forward declarations
69#if FULL_SYSTEM
70class Processor;
71namespace TheISA
72{
73 class ITB;
74 class DTB;
75}

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

132 public:
133 /** SimpleThread object, provides all the architectural state. */
134 SimpleThread *thread;
135
136 /** ThreadContext object, provides an interface for external
137 * objects to modify this thread's state.
138 */
139 ThreadContext *tc;
140
141#if USE_CHECKER
142 CheckerCPU *checker;
143#endif
123 protected:
124
125 enum Status {
126 Idle,
127 Running,
128 Faulting,
129 ITBWaitResponse,
130 IcacheRetry,

--- 291 unchanged lines hidden --- 		144 protected:
145
146 enum Status {
147 Idle,
148 Running,
149 Faulting,
150 ITBWaitResponse,
151 IcacheRetry,

--- 291 unchanged lines hidden ---