system.cc (7770:6286bb50127e) system.cc (7897:d9e8b1fd1a9f)
1/*
2 * Copyright (c) 2003-2006 The Regents of The University of Michigan
1/*
2 * Copyright (c) 2003-2006 The Regents of The University of Michigan
3 * Copyright (c) 2011 Regents of the University of California
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
10 * notice, this list of conditions and the following disclaimer in the

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

24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
26 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * Authors: Steve Reinhardt
29 * Lisa Hsu
30 * Nathan Binkert
31 * Ali Saidi
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met: redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer;
10 * redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the

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

25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 *
29 * Authors: Steve Reinhardt
30 * Lisa Hsu
31 * Nathan Binkert
32 * Ali Saidi
33 * Rick Strong
32 */
33
34#include "arch/isa_traits.hh"
35#include "arch/remote_gdb.hh"
36#include "arch/utility.hh"
37#include "base/loader/object_file.hh"
38#include "base/loader/symtab.hh"
39#include "base/trace.hh"

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

65 : SimObject(p), physmem(p->physmem), _numContexts(0),
66#if FULL_SYSTEM
67 init_param(p->init_param),
68 loadAddrMask(p->load_addr_mask),
69#else
70 pagePtr(0),
71 nextPID(0),
72#endif
34 */
35
36#include "arch/isa_traits.hh"
37#include "arch/remote_gdb.hh"
38#include "arch/utility.hh"
39#include "base/loader/object_file.hh"
40#include "base/loader/symtab.hh"
41#include "base/trace.hh"

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

67 : SimObject(p), physmem(p->physmem), _numContexts(0),
68#if FULL_SYSTEM
69 init_param(p->init_param),
70 loadAddrMask(p->load_addr_mask),
71#else
72 pagePtr(0),
73 nextPID(0),
74#endif
73 memoryMode(p->mem_mode), _params(p)
75 memoryMode(p->mem_mode), _params(p),
76 totalNumInsts(0),
77 instEventQueue("system instruction-based event queue")
74{
75 // add self to global system list
76 systemList.push_back(this);
77
78#if FULL_SYSTEM
79 kernelSymtab = new SymbolTable;
80 if (!debugSymbolTable)
81 debugSymbolTable = new SymbolTable;

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

272System::freeMemSize()
273{
274 return physmem->size() - (pagePtr << LogVMPageSize);
275}
276
277#endif
278
279void
78{
79 // add self to global system list
80 systemList.push_back(this);
81
82#if FULL_SYSTEM
83 kernelSymtab = new SymbolTable;
84 if (!debugSymbolTable)
85 debugSymbolTable = new SymbolTable;

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

276System::freeMemSize()
277{
278 return physmem->size() - (pagePtr << LogVMPageSize);
279}
280
281#endif
282
283void
284System::resume()
285{
286 SimObject::resume();
287 totalNumInsts = 0;
288}
289
290void
280System::serialize(ostream &os)
281{
282#if FULL_SYSTEM
283 kernelSymtab->serialize("kernel_symtab", os);
284#else // !FULL_SYSTEM
285 SERIALIZE_SCALAR(pagePtr);
286 SERIALIZE_SCALAR(nextPID);
287#endif

--- 43 unchanged lines hidden --- 		291System::serialize(ostream &os)
292{
293#if FULL_SYSTEM
294 kernelSymtab->serialize("kernel_symtab", os);
295#else // !FULL_SYSTEM
296 SERIALIZE_SCALAR(pagePtr);
297 SERIALIZE_SCALAR(nextPID);
298#endif

--- 43 unchanged lines hidden ---