sim_object.hh (5530:bbfff6d0c42c) sim_object.hh (5605:b194a80157e2)
1/*
2 * Copyright (c) 2001-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;

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

38
39#include <iostream>
40#include <list>
41#include <map>
42#include <string>
43#include <vector>
44
45#include "params/SimObject.hh"
1/*
2 * Copyright (c) 2001-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;

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

38
39#include <iostream>
40#include <list>
41#include <map>
42#include <string>
43#include <vector>
44
45#include "params/SimObject.hh"
46#include "sim/eventq.hh"
46#include "sim/serialize.hh"
47#include "sim/startup.hh"
48
49class BaseCPU;
50class Event;
51
52/*
53 * Abstract superclass for simulation objects. Represents things that
54 * correspond to physical components and can be specified via the
55 * config file (CPUs, caches, etc.).
56 */
47#include "sim/serialize.hh"
48#include "sim/startup.hh"
49
50class BaseCPU;
51class Event;
52
53/*
54 * Abstract superclass for simulation objects. Represents things that
55 * correspond to physical components and can be specified via the
56 * config file (CPUs, caches, etc.).
57 */
57class SimObject : public Serializable, protected StartupCallback
58class SimObject
59 : public EventManager, public Serializable, protected StartupCallback
58{
59 public:
60 enum State {
61 Running,
62 Draining,
63 Drained
64 };
65

--- 77 unchanged lines hidden --- 		60{
61 public:
62 enum State {
63 Running,
64 Draining,
65 Drained
66 };
67

--- 77 unchanged lines hidden ---