system.cc (9292:e57c7d9736a5) system.cc (9293:df7c3f99ebca)
1/*
2 * Copyright (c) 2011-2012 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

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

53#include "base/loader/symtab.hh"
54#include "base/str.hh"
55#include "base/trace.hh"
56#include "config/the_isa.hh"
57#include "cpu/thread_context.hh"
58#include "debug/Loader.hh"
59#include "debug/WorkItems.hh"
60#include "kern/kernel_stats.hh"
1/*
2 * Copyright (c) 2011-2012 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

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

53#include "base/loader/symtab.hh"
54#include "base/str.hh"
55#include "base/trace.hh"
56#include "config/the_isa.hh"
57#include "cpu/thread_context.hh"
58#include "debug/Loader.hh"
59#include "debug/WorkItems.hh"
60#include "kern/kernel_stats.hh"
61#include "mem/abstract_mem.hh"
61#include "mem/physical.hh"
62#include "params/System.hh"
63#include "sim/byteswap.hh"
64#include "sim/debug.hh"
65#include "sim/full_system.hh"
66#include "sim/system.hh"
67
68using namespace std;

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

76 : MemObject(p), _systemPort("system_port", this),
77 _numContexts(0),
78 pagePtr(0),
79 init_param(p->init_param),
80 physProxy(_systemPort),
81 virtProxy(_systemPort),
82 loadAddrMask(p->load_addr_mask),
83 nextPID(0),
62#include "mem/physical.hh"
63#include "params/System.hh"
64#include "sim/byteswap.hh"
65#include "sim/debug.hh"
66#include "sim/full_system.hh"
67#include "sim/system.hh"
68
69using namespace std;

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

77 : MemObject(p), _systemPort("system_port", this),
78 _numContexts(0),
79 pagePtr(0),
80 init_param(p->init_param),
81 physProxy(_systemPort),
82 virtProxy(_systemPort),
83 loadAddrMask(p->load_addr_mask),
84 nextPID(0),
84 physmem(p->memories),
85 physmem(name() + ".physmem", p->memories),
85 memoryMode(p->mem_mode),
86 workItemsBegin(0),
87 workItemsEnd(0),
88 numWorkIds(p->num_work_ids),
89 _params(p),
90 totalNumInsts(0),
91 instEventQueue("system instruction-based event queue")
92{

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

337void
338System::serialize(ostream &os)
339{
340 if (FullSystem)
341 kernelSymtab->serialize("kernel_symtab", os);
342 SERIALIZE_SCALAR(pagePtr);
343 SERIALIZE_SCALAR(nextPID);
344 serializeSymtab(os);
86 memoryMode(p->mem_mode),
87 workItemsBegin(0),
88 workItemsEnd(0),
89 numWorkIds(p->num_work_ids),
90 _params(p),
91 totalNumInsts(0),
92 instEventQueue("system instruction-based event queue")
93{

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

338void
339System::serialize(ostream &os)
340{
341 if (FullSystem)
342 kernelSymtab->serialize("kernel_symtab", os);
343 SERIALIZE_SCALAR(pagePtr);
344 SERIALIZE_SCALAR(nextPID);
345 serializeSymtab(os);
346
347 // also serialize the memories in the system
348 nameOut(os, csprintf("%s.physmem", name()));
349 physmem.serialize(os);
345}
346
347
348void
349System::unserialize(Checkpoint *cp, const string &section)
350{
351 if (FullSystem)
352 kernelSymtab->unserialize("kernel_symtab", cp, section);
353 UNSERIALIZE_SCALAR(pagePtr);
354 UNSERIALIZE_SCALAR(nextPID);
355 unserializeSymtab(cp, section);
350}
351
352
353void
354System::unserialize(Checkpoint *cp, const string &section)
355{
356 if (FullSystem)
357 kernelSymtab->unserialize("kernel_symtab", cp, section);
358 UNSERIALIZE_SCALAR(pagePtr);
359 UNSERIALIZE_SCALAR(nextPID);
360 unserializeSymtab(cp, section);
361
362 // also unserialize the memories in the system
363 physmem.unserialize(cp, csprintf("%s.physmem", name()));
356}
357
358void
359System::regStats()
360{
361 for (uint32_t j = 0; j < numWorkIds ; j++) {
362 workItemStats[j] = new Stats::Histogram();
363 stringstream namestr;

--- 86 unchanged lines hidden --- 		364}
365
366void
367System::regStats()
368{
369 for (uint32_t j = 0; j < numWorkIds ; j++) {
370 workItemStats[j] = new Stats::Histogram();
371 stringstream namestr;

--- 86 unchanged lines hidden ---