summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/builder.cc2
-rw-r--r--sim/builder.hh2
-rw-r--r--sim/debug.cc2
-rw-r--r--sim/debug.hh2
-rw-r--r--sim/eventq.cc2
-rw-r--r--sim/eventq.hh2
-rw-r--r--sim/main.cc2
-rw-r--r--sim/param.cc2
-rw-r--r--sim/param.hh2
-rw-r--r--sim/process.cc2
-rw-r--r--sim/process.hh2
-rw-r--r--sim/serialize.cc2
-rw-r--r--sim/serialize.hh2
-rw-r--r--sim/sim_events.cc2
-rw-r--r--sim/sim_events.hh2
-rw-r--r--sim/sim_object.cc5
-rw-r--r--sim/sim_object.hh2
-rw-r--r--sim/stat_control.cc2
-rw-r--r--sim/stat_control.hh2
-rw-r--r--sim/stats.hh2
-rw-r--r--sim/syscall_emul.cc2
-rw-r--r--sim/syscall_emul.hh2
-rw-r--r--sim/system.cc5
-rw-r--r--sim/system.hh4
-rw-r--r--sim/universe.cc2
25 files changed, 33 insertions, 25 deletions
diff --git a/sim/builder.cc b/sim/builder.cc
index 110c42f25..53e5cf3d8 100644
--- a/sim/builder.cc
+++ b/sim/builder.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/builder.hh b/sim/builder.hh
index e13a85272..a85c88b76 100644
--- a/sim/builder.hh
+++ b/sim/builder.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/debug.cc b/sim/debug.cc
index b73ab4245..293edcbe2 100644
--- a/sim/debug.cc
+++ b/sim/debug.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/debug.hh b/sim/debug.hh
index a4f8b8702..3ccf1dbd4 100644
--- a/sim/debug.hh
+++ b/sim/debug.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/eventq.cc b/sim/eventq.cc
index a0aac4fee..6b4ccc827 100644
--- a/sim/eventq.cc
+++ b/sim/eventq.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2000-2003 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/eventq.hh b/sim/eventq.hh
index ed37fd4f4..304e4b16a 100644
--- a/sim/eventq.hh
+++ b/sim/eventq.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2000-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/main.cc b/sim/main.cc
index c990d830b..54c74fd1a 100644
--- a/sim/main.cc
+++ b/sim/main.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2000-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/param.cc b/sim/param.cc
index bb372f631..4f9d0a577 100644
--- a/sim/param.cc
+++ b/sim/param.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/param.hh b/sim/param.hh
index 765a7ac1c..fe13edc48 100644
--- a/sim/param.hh
+++ b/sim/param.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2003 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/process.cc b/sim/process.cc
index 65cb8409f..7f93c1d9e 100644
--- a/sim/process.cc
+++ b/sim/process.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/process.hh b/sim/process.hh
index d235f0ef1..bd6adc55c 100644
--- a/sim/process.hh
+++ b/sim/process.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/serialize.cc b/sim/serialize.cc
index f8d6b46bf..945f97c06 100644
--- a/sim/serialize.cc
+++ b/sim/serialize.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/serialize.hh b/sim/serialize.hh
index 36622b7fe..ad490d616 100644
--- a/sim/serialize.hh
+++ b/sim/serialize.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/sim_events.cc b/sim/sim_events.cc
index 3530adedc..c454fdcf9 100644
--- a/sim/sim_events.cc
+++ b/sim/sim_events.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/sim_events.hh b/sim/sim_events.hh
index 4a8e7c115..804c41d73 100644
--- a/sim/sim_events.hh
+++ b/sim/sim_events.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2003 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/sim_object.cc b/sim/sim_object.cc
index 7f756858c..cab629f8d 100644
--- a/sim/sim_object.cc
+++ b/sim/sim_object.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,6 +36,7 @@
#include "sim/host.hh"
#include "sim/sim_object.hh"
#include "sim/stats.hh"
+#include "sim/param.hh"
using namespace std;
@@ -168,3 +169,5 @@ SimObject::serializeAll(ostream &os)
obj->serialize(os);
}
}
+
+DEFINE_SIM_OBJECT_CLASS_NAME("SimObject", SimObject)
diff --git a/sim/sim_object.hh b/sim/sim_object.hh
index b1dd19475..1a9ed363d 100644
--- a/sim/sim_object.hh
+++ b/sim/sim_object.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2001-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/stat_control.cc b/sim/stat_control.cc
index 28ee348b5..9a4313a61 100644
--- a/sim/stat_control.cc
+++ b/sim/stat_control.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/stat_control.hh b/sim/stat_control.hh
index 56170dc77..d0a9dc6ad 100644
--- a/sim/stat_control.hh
+++ b/sim/stat_control.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/stats.hh b/sim/stats.hh
index 218036eb6..8487bf331 100644
--- a/sim/stats.hh
+++ b/sim/stats.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/syscall_emul.cc b/sim/syscall_emul.cc
index 57ae39cf8..a0cbdf414 100644
--- a/sim/syscall_emul.cc
+++ b/sim/syscall_emul.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/syscall_emul.hh b/sim/syscall_emul.hh
index b425ef83c..77d104449 100644
--- a/sim/syscall_emul.hh
+++ b/sim/syscall_emul.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2003-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sim/system.cc b/sim/system.cc
index 619593abd..b5a0e7a56 100644
--- a/sim/system.cc
+++ b/sim/system.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,9 @@ System::System(const std::string _name,
bin(_bin),
binned_fns(binned_fns)
{
+ // increment the number of running systems
+ numSystemsRunning++;
+
// add self to global system list
systemList.push_back(this);
if (bin == true) {
diff --git a/sim/system.hh b/sim/system.hh
index b83945884..baf82a5b5 100644
--- a/sim/system.hh
+++ b/sim/system.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,7 @@
class MemoryController;
class PhysicalMemory;
+class Platform;
class RemoteGDB;
class GDBListener;
@@ -87,6 +88,7 @@ class System : public SimObject
const uint64_t init_param;
MemoryController *memCtrl;
PhysicalMemory *physmem;
+ Platform *platform;
bool bin;
std::vector<string> binned_fns;
diff --git a/sim/universe.cc b/sim/universe.cc
index d6c849ac7..79e32098c 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Regents of The University of Michigan
+ * Copyright (c) 2002-2004 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 23:42:29 +0000