Commit graph

565 commits

Author SHA1 Message Date
Nathan Binkert 22f78a6d03 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : fa0e28dc72b54add9e534f8f689b0f6dd8e7731c
2004-02-06 19:00:12 -05:00
Nathan Binkert 8a89f8c807 Small cleanup
--HG--
extra : convert_revision : 92f6dbd3d2c4336a0f03a9da5c390a7980ca08be
2004-02-06 18:59:12 -05:00
Erik Hallnor bdfb5de4b2 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 158117a2cba91b8cb04f41a418155149bcbba777
2004-02-06 00:13:44 -05:00
Erik Hallnor 8f0060b4ae Various extraction of common code into separate functions to make life easier.
--HG--
extra : convert_revision : ae303904e35975e65b4207f543ac93c9816e1f81
2004-02-06 00:13:26 -05:00
Andrew Schultz c76675be58 Now skips the calibrate_delay loop in the kernel boot
dev/tsunami.cc:
    Changed so Tsunami has a pointer to the System to which it belongs.
    Now it is derived from generic base class Platform so platform stuff
    can be accessed based on the system
dev/tsunami_io.cc:
dev/tsunami_io.hh:
    Cleanup and added copyright
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
    Added event to skip the "calibrate_delay" function, now calculate
    loops_per_jiffy based on frequency, interrupt frequency, and constant
sim/system.hh:
    Added pointer to generic Platform base class

--HG--
extra : convert_revision : 5bd925eec220a2ca48eb6164d2ecfdec96922c2c
2004-02-05 18:23:16 -05:00
Ali Saidi 77a30ed48d fixed mapping of device memory and i/o space
--HG--
extra : convert_revision : 9236c7f0aeb4d555880bdfdfa7f55cedf1cbb950
2004-02-05 15:12:33 -05:00
Ali Saidi 09c40bfe43 added some comments
--HG--
extra : convert_revision : eeb0a2c227261ce601ec5e5e8e57b58cbcf22a17
2004-02-05 13:22:02 -05:00
Ali Saidi f4ef613ffd mereged some comments with some of andrews changes
--HG--
extra : convert_revision : 8b3d1b2fe15eeb7d97462dac0043ca6b0863f6e6
2004-02-05 13:17:44 -05:00
Ali Saidi 7a6a435983 added some comments
--HG--
extra : convert_revision : b33c94984f8d9ac2baf8d7b45fa79460846b1755
2004-02-05 13:05:20 -05:00
David Oehmke 95c248c213 Modify the emulated system calls to support running the SPEC Int
benchmarks for alpha-linux.

arch/alpha/alpha_linux_process.cc:
    Added some more ioctl commands to ignore.
    Set unlink and rename to the new functions.
    Ignore setrlimit, times and rt_sigaction.
    Should eventually provide a function for times.
arch/alpha/alpha_tru64_process.cc:
    Added some more ioctl commands to ignore.
    Set unlink and rename to the new functions.
    Ignore setrlimit.
sim/syscall_emul.cc:
    Added implementations for unlink and rename.
sim/syscall_emul.hh:
    Added unlink and rename functions.
    Added a couple more ioctl requests to ignore.
    Print out the PC of any ioctl commands that fail.

--HG--
extra : convert_revision : 8af21c7fa7d0645d3f9324c9ce70ad33590c3c8e
2004-02-05 12:16:17 -05:00
Nathan Binkert 4bbe8c1058 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : 9ee9b8550b5761fa400df83caf268bd1c8ddc7ed
2004-02-05 02:53:03 -05:00
Andrew Schultz daa579fc0f Fix PCI code so it builds properly now
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami.cc:
dev/tsunami.hh:
    A bunch of changes to clean up new PCI code and to fix build

--HG--
extra : convert_revision : 71063bcc565c50fc293b323ddce2c8e701f544ff
2004-02-05 02:25:45 -05:00
Ali Saidi 69e1e10f5d Added code so that BAR writes will result in an updated memory mapping
dev/pcidev.cc:
dev/pcidev.hh:
    BAR changes should now change the mmu mapping

--HG--
extra : convert_revision : 2d5c60ef076ab0588a25def1ecd9dbb90c9144d7
2004-02-04 19:56:24 -05:00
Erik Hallnor f2af9be29e Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 2f3653bbd0ab20308dcff5db176dc926402e9ad7
2004-02-04 16:55:17 -05:00
Erik Hallnor 2d6db0359e Change IIC to use param class. Tweak parameters in CacheTags.
--HG--
extra : convert_revision : 8239a7befe49c81b6b1f239fc478910441f64352
2004-02-04 16:55:05 -05:00
Andrew Schultz aaaa782165 Removed the tsunami_pci* files
--HG--
extra : convert_revision : e4a65d2664f2cd952d206d2079e3d093a35c20aa
2004-02-04 15:04:36 -05:00
Andrew Schultz f2b8df2420 Changes to support PciDev as a new base class for devices which use PCI
--HG--
extra : convert_revision : fc2bc4399665344220b1a7e345ae6d2df03c9960
2004-02-04 15:03:50 -05:00
Steve Reinhardt 98948b2e57 More reformatting of reference parameter declarations.
The last change only caught the ones with types that
started with capitals.  This pass catches the rest
(mostly STL and uint*_t types).

base/cprintf_formats.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/serialize.cc:
sim/serialize.hh:
    Change "foo_t& foo" to "foo_t &foo".

--HG--
extra : convert_revision : fc7f7425db2aef33e490f952b5ce74c8c36d0d41
2004-02-04 11:16:30 -08:00
Andrew Schultz 579c5b59e1 Removed pci_dev from AdaptecController
--HG--
extra : convert_revision : 2e2b388ff48bd2718cc2208983e6ba5626317ee8
2004-02-03 18:56:39 -05:00
Andrew Schultz 9b18af0887 Forgot to fixup the boot_linux.ini file to use AdaptecController
--HG--
extra : convert_revision : a4d7aa7b795f3495dd1272a1014a492f916b4f38
2004-02-03 17:09:49 -05:00
Andrew Schultz 0a585921f0 Mostly changes to point Tsunami related stuff to use AdaptecController
dev/tsunami.cc:
dev/tsunami.hh:
    Change to use AdaptecController with Tsunami

--HG--
extra : convert_revision : 6ff4f9f7ae1959589340b2ab23755b4dbfec4dbc
2004-02-03 17:02:48 -05:00
Andrew Schultz d08e1bc569 Fix to support redefinition of functional_memory base class
--HG--
extra : convert_revision : c06b2cfd2787022ee5dc664886873a9afa459434
2004-02-03 16:59:40 -05:00
Andrew Schultz 8a28933c24 Automerged
--HG--
extra : convert_revision : 7925eb08f4ebc3e846a1a304eeeb832b48862fca
2004-02-03 16:35:26 -05:00
Ali Saidi 53d81cfe32 Merge zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/kernel
into zizzer.eecs.umich.edu:/y/saidi/work/m5

--HG--
extra : convert_revision : 2a71828fc732961ab2fcee1afee0f6daa092e4c9
2004-02-03 16:28:48 -05:00
Ali Saidi 0476a4ee12 Aded tsunami_pcidev and associated updates
--HG--
extra : convert_revision : f29f421c966e36aa372d0faef6257c1aea205a03
2004-02-03 16:23:51 -05:00
Erik Hallnor 56bb8ec48d Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : e94049f2b2dfbd2f1a018ddd6c05a4882d0f4a82
2004-02-03 12:58:34 -05:00
Nathan Binkert 85bc028185 merge
--HG--
extra : convert_revision : 47425264e672f727cbb13aa7b9bb2a67790b25e8
2004-02-03 11:24:03 -05:00
Nathan Binkert 368e6e3e57 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 9b8a94cbaacbbb4a53d15c0893ee4d3183f29ce0
2004-02-03 10:51:10 -05:00
Nathan Binkert b1221a3395 Remote debugging cleanup and internal debugging support
base/kgdb.h:
    Remove flags that aren't used
base/remote_gdb.cc:
    Better debugging:
    - Give each class a name() function so that the trace infrastructure
    knows the correct object name.
    - Make the remote debugger capable of detach.
    - Split out the RGDB trace flag into a bunch of specific flags.
    Remove dead code
    Add a new trap type
base/remote_gdb.hh:
    Add a name() to the various objects for the trace system
base/trace.hh:
    don't need a using directive
    add DPRINTFNR: debug printf, no flag, raw output
kern/tru64/tru64_system.cc:
    use the INT trap type instead of IF

--HG--
extra : convert_revision : 25e610216c6f43d5d328651bba915f71bade059e
2004-02-03 10:50:04 -05:00
Steve Reinhardt 3e5070a3f1 Fix bug: forgot branchTarget() method on indirect branches.
arch/alpha/isa_desc:
    Add missing branchTarget() method for indirect branches.
cpu/static_inst.hh:
    Add comment clarifying when branchTarget() can be used
    on indirect branches.

--HG--
extra : convert_revision : 0dcfb36a9792a338cefceb3d1501825abace7ac5
2004-02-03 07:19:05 -08:00
Steve Reinhardt 2f369ee5d5 Fix handling of uncacheable loads. Make them wait until they're at the tail of
the ROB (so we know they're correct-path) before we mark them ready to issue.

--HG--
extra : convert_revision : be1d431bdc939100d79a5fea3e415b3acf9e8d75
2004-02-02 19:09:47 -08:00
Steve Reinhardt 19cc144960 Get rid of LVQ-port function unit... only used for redundant
multithreading, which has been gone for a long time.

--HG--
extra : convert_revision : 717d13455483c3adc7b7cbbcc5f7493d51867974
2004-02-02 18:58:23 -08:00
Steve Reinhardt 9bfd18a155 Clean up some confusing ROBStation fields left over from SS (ea_comp, in_LSQ).
Eliminate indirect decoder.cc dependence on rob_station.hh via full_cpu.hh.

--HG--
extra : convert_revision : 9355cddd6cd8bbe100aae1b2d45d2752e76ba3f6
2004-02-02 18:53:27 -08:00
Steve Reinhardt b79f6b3273 insn->inst
--HG--
extra : convert_revision : fcc556fb7e65855ec3c04ef272177c8e7a38fff9
2004-02-02 18:14:11 -08:00
Steve Reinhardt 548b4a1cb0 Change "Foo& foo" declarations to "Foo &foo".
This primarily to be internally consistent (sometimes we used one,
sometimes the other, even within the same line of code!).
I picked the latter to be symmetric with "Foo *foo".

base/cprintf_formats.hh:
base/range.hh:
base/refcnt.hh:
base/res_list.hh:
base/statistics.hh:
base/str.hh:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/syscall_emul.hh:
    Change "Foo& foo" declarations to "Foo &foo".

--HG--
extra : convert_revision : ca1b0e85a578b539214bda3b8d61ac23792f2e87
2004-02-02 15:55:35 -08:00
Steve Reinhardt 956aff1291 More conversions of ref-counted parameters to references:
Statistics::NodePtr, StaticInstPtr, ethernet PacketPtr.

base/statistics.hh:
    Change NodePtr parameters to Nodeptr &.
cpu/exetrace.hh:
    Change StaticInstPtr parameters to StaticInstPtr &.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ethertap.hh:
    change PacketPtr parameters to PacketPtr &.

--HG--
extra : convert_revision : a778efdca33b0ec5beb76cf47db0e9e4728897ee
2004-02-02 15:45:22 -08:00
Erik Hallnor 16bb300586 Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision : 0cceed934a4f44c27c8293780fc927ef2c00869d
2004-02-02 14:11:59 -05:00
Erik Hallnor 423d858061 Change the way the IIC way list is handled in the primary table.
--HG--
extra : convert_revision : 476f738d59446bdc43d1bd67950aac310b22a42c
2004-02-02 14:10:24 -05:00
Steve Reinhardt 7b07b0877f Change MemReqPtr parameters to references.
This avoids incrementing and decrementing the MemReq
reference counters on every call and return.

arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/exec_context.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
dev/alpha_console.cc:
dev/alpha_console.hh:
    Change MemReqPtr parameters to references.

--HG--
extra : convert_revision : 3ba18bdd9f996563988402576bfdd3430e1ab1e5
2004-02-02 10:47:21 -08:00
Steve Reinhardt 7c8413db10 Make stats:dump_period work even if dump_cycle isn't set.
--HG--
extra : convert_revision : 9e85c0fa0f6c5393dd8e91034a49975628cf825d
2004-02-02 07:19:45 -08:00
Andrew Schultz 64b6bad6ab Change configs to use SimpleController instead of ScsiController
--HG--
extra : convert_revision : f8288b13cc0d4ad8ef5cab458012cb5a5cb242c4
2004-01-31 05:38:16 -05:00
Andrew Schultz 240a434e88 Split the SCSI controller into a base class (ScsiController) and
two seperate implementations (SimpleController for Tru64 and
AdaptecController for Linux)

--HG--
extra : convert_revision : 5458a42d34e6001b3ea11b87511b1f9ee853b4f7
2004-01-31 05:36:14 -05:00
Ali Saidi 5164de4a03 added tsunami_pcidev
--HG--
extra : convert_revision : 14ad0f7afd930c29ff45f6edd51db8d8f8a07be0
2004-01-31 01:25:13 -05:00
Nathan Binkert bbf952376e Update for changes in the console
This is basically the same thing that was done for tlaser_uart

--HG--
extra : convert_revision : e0de84b83d1ee4fe0ef769b4de232dbbd7d9c228
2004-01-30 18:12:48 -05:00
Nathan Binkert 35fb439c33 Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel

--HG--
extra : convert_revision : 9bb172c13912f69c53897ae215e077c9b8194dd9
2004-01-30 18:10:15 -05:00
Andrew Schultz 60279bb67e Fixed the spec2000.ini file and made some cosmetic changes to the
setup-spec script

util/setup-spec:
    Made some changes so the information contained in the ini file explains
    what the init_param value corresponds to

--HG--
extra : convert_revision : 4082209f920244c262150c224a92ea21a55febd5
2004-01-30 17:38:25 -05:00
Andrew Schultz 74ae052b69 Added the spec2000 ini file
--HG--
extra : convert_revision : 981a5a536a25b07dd54ed0166b291876b0a498c0
2004-01-30 17:20:03 -05:00
Nathan Binkert 4ae64216c3 Merge
--HG--
extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b
2004-01-30 16:01:26 -05:00
Nathan Binkert a0c3e61d32 Merge Sampler
--HG--
extra : convert_revision : d10232f4602790f3b325e2e10e3098caaeaa53b3
2004-01-30 15:59:06 -05:00
Ali Saidi 0035440536 Linux boots with no devices
dev/tsunami.hh:
    Started commenting code
dev/tsunami_cchip.cc:
    removed unneccessary config files
dev/tsunami_io.cc:
    Added code to see the value written
dev/tsunami_uart.cc:
    conviently one of the addresses the SuperI/O southbridge can be is the same space
    as the UART. This stops the simulator from panicing although it should probably be
    changed a bit.

--HG--
extra : convert_revision : a3334a2c418ee8228089d0e1791fa78bbb276fe5
2004-01-30 15:24:50 -05:00