changeset a9d06c894afe in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=a9d06c894afe
description:
fix some build problems from prior changesets
diffstat:
src/arch/arm/interrupts.hh | 1 +
src/arch/arm/linux/system.cc | 1 +
src/arch/arm/table_walker.cc | 3 +++
src/dev/arm/amba_device.cc | 1 +
src/dev/arm/amba_fake.cc | 1 +
src/dev/arm/gic.cc | 2 ++
src/dev/arm/kmi.cc | 1 +
src/dev/arm/pl011.cc | 2 ++
src/dev/arm/pl111.cc | 2 ++
src/dev/arm/timer_sp804.cc | 2 ++
src/mem/slicc/symbols/Func.py | 1 +
src/python/m5/main.py | 5 ++++-
src/python/m5/simulate.py | 2 +-
13 files changed, 22 insertions(+), 2 deletions(-)
diffs (168 lines):
diff -r 95b2bf400ee4 -r a9d06c894afe src/arch/arm/interrupts.hh
--- a/src/arch/arm/interrupts.hh Wed Apr 20 13:47:42 2011 -0700
+++ b/src/arch/arm/interrupts.hh Wed Apr 20 18:45:03 2011 -0700
@@ -48,6 +48,7 @@
#include "arch/arm/miscregs.hh"
#include "arch/arm/registers.hh"
#include "cpu/thread_context.hh"
+#include "debug/Interrupt.hh"
#include "params/ArmInterrupts.hh"
#include "sim/sim_object.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/arch/arm/linux/system.cc
--- a/src/arch/arm/linux/system.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/arch/arm/linux/system.cc Wed Apr 20 18:45:03 2011 -0700
@@ -47,6 +47,7 @@
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
#include "cpu/thread_context.hh"
+#include "debug/Loader.hh"
#include "kern/linux/events.hh"
#include "mem/physical.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/arch/arm/table_walker.cc
--- a/src/arch/arm/table_walker.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/arch/arm/table_walker.cc Wed Apr 20 18:45:03 2011 -0700
@@ -42,6 +42,9 @@
#include "arch/arm/tlb.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/TLB.hh"
+#include "debug/TLBVerbose.hh"
#include "dev/io_device.hh"
#include "sim/system.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/amba_device.cc
--- a/src/dev/arm/amba_device.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/amba_device.cc Wed Apr 20 18:45:03 2011 -0700
@@ -41,6 +41,7 @@
*/
#include "base/trace.hh"
+#include "debug/AMBA.hh"
#include "dev/arm/amba_device.hh"
#include "dev/arm/amba_fake.hh"
#include "mem/packet.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/amba_fake.cc
--- a/src/dev/arm/amba_fake.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/amba_fake.cc Wed Apr 20 18:45:03 2011 -0700
@@ -41,6 +41,7 @@
*/
#include "base/trace.hh"
+#include "debug/AMBA.hh"
#include "dev/arm/amba_fake.hh"
#include "mem/packet.hh"
#include "mem/packet_access.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/gic.cc
--- a/src/dev/arm/gic.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/gic.cc Wed Apr 20 18:45:03 2011 -0700
@@ -43,6 +43,8 @@
#include "base/trace.hh"
#include "cpu/intr_control.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/GIC.hh"
#include "dev/arm/gic.hh"
#include "dev/platform.hh"
#include "dev/terminal.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/kmi.cc
--- a/src/dev/arm/kmi.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/kmi.cc Wed Apr 20 18:45:03 2011 -0700
@@ -43,6 +43,7 @@
#include "base/vnc/vncserver.hh"
#include "base/trace.hh"
+#include "debug/Pl050.hh"
#include "dev/arm/amba_device.hh"
#include "dev/arm/kmi.hh"
#include "dev/ps2.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/pl011.cc
--- a/src/dev/arm/pl011.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/pl011.cc Wed Apr 20 18:45:03 2011 -0700
@@ -41,6 +41,8 @@
*/
#include "base/trace.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/Uart.hh"
#include "dev/arm/amba_device.hh"
#include "dev/arm/gic.hh"
#include "dev/arm/pl011.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/pl111.cc
--- a/src/dev/arm/pl111.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/pl111.cc Wed Apr 20 18:45:03 2011 -0700
@@ -42,6 +42,8 @@
#include "base/bitmap.hh"
#include "base/output.hh"
#include "base/trace.hh"
+#include "debug/PL111.hh"
+#include "debug/Uart.hh"
#include "dev/arm/amba_device.hh"
#include "dev/arm/gic.hh"
#include "dev/arm/pl111.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/dev/arm/timer_sp804.cc
--- a/src/dev/arm/timer_sp804.cc Wed Apr 20 13:47:42 2011 -0700
+++ b/src/dev/arm/timer_sp804.cc Wed Apr 20 18:45:03 2011 -0700
@@ -39,6 +39,8 @@
#include "base/intmath.hh"
#include "base/trace.hh"
+#include "debug/Checkpoint.hh"
+#include "debug/Timer.hh"
#include "dev/arm/gic.hh"
#include "dev/arm/timer_sp804.hh"
#include "mem/packet.hh"
diff -r 95b2bf400ee4 -r a9d06c894afe src/mem/slicc/symbols/Func.py
--- a/src/mem/slicc/symbols/Func.py Wed Apr 20 13:47:42 2011 -0700
+++ b/src/mem/slicc/symbols/Func.py Wed Apr 20 18:45:03 2011 -0700
@@ -77,6 +77,7 @@
code('''
/** Auto generated C++ code started by $__file__:$__line__ */
+#include "debug/RubySlicc.hh"
#include "mem/protocol/Types.hh"
''')
diff -r 95b2bf400ee4 -r a9d06c894afe src/python/m5/main.py
--- a/src/python/m5/main.py Wed Apr 20 13:47:42 2011 -0700
+++ b/src/python/m5/main.py Wed Apr 20 18:45:03 2011 -0700
@@ -144,6 +144,8 @@
code.InteractiveConsole(scope).interact(banner)
def main(*args):
+ import m5
+
import core
import debug
import defines
@@ -154,7 +156,6 @@
from util import fatal
- global options
if len(args) == 0:
options, arguments = parse_options()
elif len(args) == 2:
@@ -162,6 +163,8 @@
else:
raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args)
+ m5.options = options
+
def check_tracing():
if defines.TRACING_ON:
return
diff -r 95b2bf400ee4 -r a9d06c894afe src/python/m5/simulate.py
--- a/src/python/m5/simulate.py Wed Apr 20 13:47:42 2011 -0700
+++ b/src/python/m5/simulate.py Wed Apr 20 18:45:03 2011 -0700
@@ -47,7 +47,7 @@
# The final hook to generate .ini files. Called from the user script
# once the config is built.
def instantiate(ckpt_dir=None):
- from main import options
+ from m5 import options
root = objects.Root.getInstance()
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
