fix some build problems from prior changesets
This commit is contained in:
parent
41680f4bad
commit
99fbd18ea5
|
@ -48,6 +48,7 @@
|
||||||
#include "arch/arm/miscregs.hh"
|
#include "arch/arm/miscregs.hh"
|
||||||
#include "arch/arm/registers.hh"
|
#include "arch/arm/registers.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
|
#include "debug/Interrupt.hh"
|
||||||
#include "params/ArmInterrupts.hh"
|
#include "params/ArmInterrupts.hh"
|
||||||
#include "sim/sim_object.hh"
|
#include "sim/sim_object.hh"
|
||||||
|
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "base/loader/object_file.hh"
|
#include "base/loader/object_file.hh"
|
||||||
#include "base/loader/symtab.hh"
|
#include "base/loader/symtab.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
|
#include "debug/Loader.hh"
|
||||||
#include "kern/linux/events.hh"
|
#include "kern/linux/events.hh"
|
||||||
#include "mem/physical.hh"
|
#include "mem/physical.hh"
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,9 @@
|
||||||
#include "arch/arm/tlb.hh"
|
#include "arch/arm/tlb.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
|
#include "debug/Checkpoint.hh"
|
||||||
|
#include "debug/TLB.hh"
|
||||||
|
#include "debug/TLBVerbose.hh"
|
||||||
#include "dev/io_device.hh"
|
#include "dev/io_device.hh"
|
||||||
#include "sim/system.hh"
|
#include "sim/system.hh"
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/AMBA.hh"
|
||||||
#include "dev/arm/amba_device.hh"
|
#include "dev/arm/amba_device.hh"
|
||||||
#include "dev/arm/amba_fake.hh"
|
#include "dev/arm/amba_fake.hh"
|
||||||
#include "mem/packet.hh"
|
#include "mem/packet.hh"
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/AMBA.hh"
|
||||||
#include "dev/arm/amba_fake.hh"
|
#include "dev/arm/amba_fake.hh"
|
||||||
#include "mem/packet.hh"
|
#include "mem/packet.hh"
|
||||||
#include "mem/packet_access.hh"
|
#include "mem/packet_access.hh"
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#include "cpu/intr_control.hh"
|
#include "cpu/intr_control.hh"
|
||||||
|
#include "debug/Checkpoint.hh"
|
||||||
|
#include "debug/GIC.hh"
|
||||||
#include "dev/arm/gic.hh"
|
#include "dev/arm/gic.hh"
|
||||||
#include "dev/platform.hh"
|
#include "dev/platform.hh"
|
||||||
#include "dev/terminal.hh"
|
#include "dev/terminal.hh"
|
||||||
|
|
|
@ -43,6 +43,7 @@
|
||||||
|
|
||||||
#include "base/vnc/vncserver.hh"
|
#include "base/vnc/vncserver.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/Pl050.hh"
|
||||||
#include "dev/arm/amba_device.hh"
|
#include "dev/arm/amba_device.hh"
|
||||||
#include "dev/arm/kmi.hh"
|
#include "dev/arm/kmi.hh"
|
||||||
#include "dev/ps2.hh"
|
#include "dev/ps2.hh"
|
||||||
|
|
|
@ -41,6 +41,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/Checkpoint.hh"
|
||||||
|
#include "debug/Uart.hh"
|
||||||
#include "dev/arm/amba_device.hh"
|
#include "dev/arm/amba_device.hh"
|
||||||
#include "dev/arm/gic.hh"
|
#include "dev/arm/gic.hh"
|
||||||
#include "dev/arm/pl011.hh"
|
#include "dev/arm/pl011.hh"
|
||||||
|
|
|
@ -42,6 +42,8 @@
|
||||||
#include "base/bitmap.hh"
|
#include "base/bitmap.hh"
|
||||||
#include "base/output.hh"
|
#include "base/output.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/PL111.hh"
|
||||||
|
#include "debug/Uart.hh"
|
||||||
#include "dev/arm/amba_device.hh"
|
#include "dev/arm/amba_device.hh"
|
||||||
#include "dev/arm/gic.hh"
|
#include "dev/arm/gic.hh"
|
||||||
#include "dev/arm/pl111.hh"
|
#include "dev/arm/pl111.hh"
|
||||||
|
|
|
@ -39,6 +39,8 @@
|
||||||
|
|
||||||
#include "base/intmath.hh"
|
#include "base/intmath.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#include "debug/Checkpoint.hh"
|
||||||
|
#include "debug/Timer.hh"
|
||||||
#include "dev/arm/gic.hh"
|
#include "dev/arm/gic.hh"
|
||||||
#include "dev/arm/timer_sp804.hh"
|
#include "dev/arm/timer_sp804.hh"
|
||||||
#include "mem/packet.hh"
|
#include "mem/packet.hh"
|
||||||
|
|
|
@ -77,6 +77,7 @@ class Func(Symbol):
|
||||||
code('''
|
code('''
|
||||||
/** Auto generated C++ code started by $__file__:$__line__ */
|
/** Auto generated C++ code started by $__file__:$__line__ */
|
||||||
|
|
||||||
|
#include "debug/RubySlicc.hh"
|
||||||
#include "mem/protocol/Types.hh"
|
#include "mem/protocol/Types.hh"
|
||||||
''')
|
''')
|
||||||
|
|
||||||
|
|
|
@ -144,6 +144,8 @@ def interact(scope):
|
||||||
code.InteractiveConsole(scope).interact(banner)
|
code.InteractiveConsole(scope).interact(banner)
|
||||||
|
|
||||||
def main(*args):
|
def main(*args):
|
||||||
|
import m5
|
||||||
|
|
||||||
import core
|
import core
|
||||||
import debug
|
import debug
|
||||||
import defines
|
import defines
|
||||||
|
@ -154,7 +156,6 @@ def main(*args):
|
||||||
|
|
||||||
from util import fatal
|
from util import fatal
|
||||||
|
|
||||||
global options
|
|
||||||
if len(args) == 0:
|
if len(args) == 0:
|
||||||
options, arguments = parse_options()
|
options, arguments = parse_options()
|
||||||
elif len(args) == 2:
|
elif len(args) == 2:
|
||||||
|
@ -162,6 +163,8 @@ def main(*args):
|
||||||
else:
|
else:
|
||||||
raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args)
|
raise TypeError, "main() takes 0 or 2 arguments (%d given)" % len(args)
|
||||||
|
|
||||||
|
m5.options = options
|
||||||
|
|
||||||
def check_tracing():
|
def check_tracing():
|
||||||
if defines.TRACING_ON:
|
if defines.TRACING_ON:
|
||||||
return
|
return
|
||||||
|
|
|
@ -47,7 +47,7 @@ MaxTick = 2**63 - 1
|
||||||
# The final hook to generate .ini files. Called from the user script
|
# The final hook to generate .ini files. Called from the user script
|
||||||
# once the config is built.
|
# once the config is built.
|
||||||
def instantiate(ckpt_dir=None):
|
def instantiate(ckpt_dir=None):
|
||||||
from main import options
|
from m5 import options
|
||||||
|
|
||||||
root = objects.Root.getInstance()
|
root = objects.Root.getInstance()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue