random mix of tidbits
configs/test/fs.py: update fs.py to use a bus bridge cpu/simple/cpu.hh: cpu should just return that it doesn't snoop any address ranges python/m5/objects/System.py: move boot_osflags to system --HG-- extra : convert_revision : b4256df7eada7e65b69513361de8bffc3fdd680b
This commit is contained in:
parent
c4b3a2fa0f
commit
79170b1be5
3 changed files with 12 additions and 4 deletions
|
@ -139,9 +139,13 @@ class LinuxTsunami(BaseTsunami):
|
||||||
pci_func=0, pci_dev=0, pci_bus=0)
|
pci_func=0, pci_dev=0, pci_bus=0)
|
||||||
|
|
||||||
class LinuxAlphaSystem(LinuxAlphaSystem):
|
class LinuxAlphaSystem(LinuxAlphaSystem):
|
||||||
magicbus = Bus()
|
magicbus = Bus(bus_id=0)
|
||||||
|
magicbus2 = Bus(bus_id=1)
|
||||||
|
bridge = Bridge()
|
||||||
physmem = PhysicalMemory(range = AddrRange('128MB'))
|
physmem = PhysicalMemory(range = AddrRange('128MB'))
|
||||||
c1 = Connector(side_a=Parent.physmem, side_b=Parent.magicbus)
|
c0a = Connector(side_a=Parent.magicbus, side_b=Parent.bridge, side_b_name="side_a")
|
||||||
|
c0b = Connector(side_a=Parent.magicbus2, side_b=Parent.bridge, side_b_name="side_b")
|
||||||
|
c1 = Connector(side_a=Parent.physmem, side_b=Parent.magicbus2)
|
||||||
tsunami = LinuxTsunami()
|
tsunami = LinuxTsunami()
|
||||||
c2 = Connector(side_a=Parent.tsunami.cchip, side_a_name='pio', side_b=Parent.magicbus)
|
c2 = Connector(side_a=Parent.tsunami.cchip, side_a_name='pio', side_b=Parent.magicbus)
|
||||||
c3 = Connector(side_a=Parent.tsunami.pchip, side_a_name='pio', side_b=Parent.magicbus)
|
c3 = Connector(side_a=Parent.tsunami.pchip, side_a_name='pio', side_b=Parent.magicbus)
|
||||||
|
@ -177,7 +181,7 @@ class LinuxAlphaSystem(LinuxAlphaSystem):
|
||||||
read_only=True)
|
read_only=True)
|
||||||
simple_disk = SimpleDisk(disk=Parent.raw_image)
|
simple_disk = SimpleDisk(disk=Parent.raw_image)
|
||||||
intrctrl = IntrControl()
|
intrctrl = IntrControl()
|
||||||
cpu = SimpleCPU(mem=Parent.magicbus)
|
cpu = SimpleCPU(mem=Parent.magicbus2)
|
||||||
sim_console = SimConsole(listener=ConsoleListener(port=3456))
|
sim_console = SimConsole(listener=ConsoleListener(port=3456))
|
||||||
kernel = '/z/saidi/work/m5.newmem/build/vmlinux'
|
kernel = '/z/saidi/work/m5.newmem/build/vmlinux'
|
||||||
pal = binary('ts_osfpal')
|
pal = binary('ts_osfpal')
|
||||||
|
|
|
@ -103,6 +103,10 @@ class SimpleCPU : public BaseCPU
|
||||||
virtual void recvStatusChange(Status status);
|
virtual void recvStatusChange(Status status);
|
||||||
|
|
||||||
virtual Packet *recvRetry();
|
virtual Packet *recvRetry();
|
||||||
|
|
||||||
|
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
||||||
|
AddrRangeList &snoop)
|
||||||
|
{ resp.clear(); snoop.clear(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
MemObject *mem;
|
MemObject *mem;
|
||||||
|
|
|
@ -9,6 +9,7 @@ class System(SimObject):
|
||||||
init_param = Param.UInt64(0, "numerical value to pass into simulator")
|
init_param = Param.UInt64(0, "numerical value to pass into simulator")
|
||||||
bin = Param.Bool(False, "is this system binned")
|
bin = Param.Bool(False, "is this system binned")
|
||||||
binned_fns = VectorParam.String([], "functions broken down and binned")
|
binned_fns = VectorParam.String([], "functions broken down and binned")
|
||||||
|
boot_osflags = Param.String("a", "boot flags to pass to the kernel")
|
||||||
kernel = Param.String("file that contains the kernel code")
|
kernel = Param.String("file that contains the kernel code")
|
||||||
readfile = Param.String("", "file to read startup script from")
|
readfile = Param.String("", "file to read startup script from")
|
||||||
|
|
||||||
|
@ -16,6 +17,5 @@ class AlphaSystem(System):
|
||||||
type = 'AlphaSystem'
|
type = 'AlphaSystem'
|
||||||
console = Param.String("file that contains the console code")
|
console = Param.String("file that contains the console code")
|
||||||
pal = Param.String("file that contains palcode")
|
pal = Param.String("file that contains palcode")
|
||||||
boot_osflags = Param.String("a", "boot flags to pass to the kernel")
|
|
||||||
system_type = Param.UInt64("Type of system we are emulating")
|
system_type = Param.UInt64("Type of system we are emulating")
|
||||||
system_rev = Param.UInt64("Revision of system we are emulating")
|
system_rev = Param.UInt64("Revision of system we are emulating")
|
||||||
|
|
Loading…
Reference in a new issue