44,45d43
< addToPath(config_root+'/configs/ruby/protocols')
< addToPath(config_root+'/configs/ruby/topologies')
52,53c50
< # Set the default cache size and associativity to be very small to encourage
< # races between requests and writebacks.
---
> # Add the ruby specific and protocol specific options
55,60c52
< parser.add_option("--l1d_size", type="string", default="256B")
< parser.add_option("--l1i_size", type="string", default="256B")
< parser.add_option("--l2_size", type="string", default="512B")
< parser.add_option("--l1d_assoc", type="int", default=2)
< parser.add_option("--l1i_assoc", type="int", default=2)
< parser.add_option("--l2_assoc", type="int", default=2)
---
> Ruby.define_options(parser)
65a58,70
> #
> # Set the default cache size and associativity to be very small to encourage
> # races between requests and writebacks.
> #
> options.l1d_size="256B"
> options.l1i_size="256B"
> options.l2_size="512B"
> options.l3_size="1kB"
> options.l1d_assoc=2
> options.l1i_assoc=2
> options.l2_assoc=2
> options.l3_assoc=2
>
70,71c75
< system = System(cpu = cpu,
< physmem = PhysicalMemory())
---
> system = System(cpu = cpu, physmem = PhysicalMemory())
73c77
< system.ruby = Ruby.create_system(options, system.physmem)
---
> system.ruby = Ruby.create_system(options, system)