Lisa Hsu [Mon, 21 Jun 2004 21:25:18 +0000 (17:25 -0400)]
l
base/traceflags.py:
added some more traceflags for ethernet to break it up better
dev/etherpkt.hh:
since we are not network host order, must reverse bytes for these typechecks.
also, overload isTcp/UdpPkt to take an argument so you don't have to reget the ip header if you've already got one.
dev/ns_gige.cc:
1) add some functions that reverse Endianness so we can generate adn evaluate checksum adn dprintf data accurately/more understandably
2) forget about the implementation of fifo fill/drain thresholds, it's not used by the driver much, nor does it matter with use sending/receiving in whole packets anyway.
get rid of teh associated variables.
3) get rid of txFifoCnt the variable, it's redundant and unnecessary, just use txFifoAvail.
4) change io_enable to ioEnable, just to be picky.
5) modify some DPRINTF's to be clearer, also added a lot, and spread them into better traceflag categories
6) fix the device bug! it's the intrTick = 0 at teh beginning of cpuInterrupt().
7) clear some bools in regsReset() so they don't holdover wrong state
8) fix pseudo header generation for Tcp checksumming to account for network order
dev/ns_gige.hh:
change io_enable to ioEnable, get rid of fill/drain thresh related variables and txFifoCnt, which is redundant
--HG--
extra : convert_revision :
c538b75731f3c9e04354f57e6df9a40aeca5096d
Ali Saidi [Thu, 17 Jun 2004 19:36:59 +0000 (15:36 -0400)]
Serialized cpu interrupts
cpu/simple_cpu/simple_cpu.cc:
called basecpu serialization
--HG--
extra : convert_revision :
1a639b5e3c08e47a5d581c18b2b53fe87bd05b73
Andrew Schultz [Thu, 17 Jun 2004 15:24:14 +0000 (11:24 -0400)]
Fixes to IDE disk to fix serialization. Now passes simple CPU serialize
tests
dev/ide_ctrl.cc:
Formatting
dev/ide_disk.cc:
Remove some junk, add an assert to serialize, and add missing serialize
for command register.
--HG--
extra : convert_revision :
8f99857e32f278dd4e6f23deffc8047c6411d5b2
Andrew Schultz [Wed, 16 Jun 2004 23:47:07 +0000 (19:47 -0400)]
Fix serialize/unserialize of the timers and RTC events
--HG--
extra : convert_revision :
aecf09b3b13a23ffef852a1539e8d4eec32008ad
Ali Saidi [Wed, 16 Jun 2004 22:20:10 +0000 (18:20 -0400)]
Updated serialization code and added #if tracing so that make fast
builds
dev/ide_ctrl.cc:
added #if to remove variables that are optimized out.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Updated serialization code
--HG--
extra : convert_revision :
b322a3299097cbd05b9b5bb8b0a80e9fa33bdc20
Lisa Hsu [Sat, 12 Jun 2004 18:24:20 +0000 (14:24 -0400)]
minor mods for mimicking NS83820 functionality
dev/ide_ctrl.cc:
generalize these #defs
dev/ide_ctrl.hh:
put these in pcireg.h
dev/ns_gige.cc:
do i need io_enable? and assert will fail if i actually need to implement it, which may give clue as to wehtehr i need to implmeent the mem_enable and bm_enable stuff.
dev/ns_gige.hh:
implement this in case it's needed
dev/pcireg.h:
put these defs in pcireg instead
--HG--
extra : convert_revision :
5e3581b5da17410f943907139bd479f15d2231e8
Lisa Hsu [Sat, 12 Jun 2004 16:59:43 +0000 (12:59 -0400)]
fix the SYSTEMDIR #def
--HG--
extra : convert_revision :
cf5fd4aeaf96787345e233ddcd58f5eae55e0c27
Lisa Hsu [Fri, 11 Jun 2004 19:26:21 +0000 (15:26 -0400)]
fix serialization
dev/ns_gige.cc:
fix serialization and move regsReset into the cc file
dev/ns_gige.hh:
put regsReset into cc instead of here in hh
--HG--
extra : convert_revision :
3a8796fa583e0765503104a9dbe28cc69f1a8fa9
Lisa Hsu [Fri, 11 Jun 2004 19:01:18 +0000 (15:01 -0400)]
fix ini messups with the reorg
--HG--
extra : convert_revision :
67a36f724800b74fd0fcec9727bb2ea98ddc73e9
Ali Saidi [Fri, 11 Jun 2004 05:55:20 +0000 (01:55 -0400)]
after unserialization in the ide driver we need to reprogram the
busbridges. Also small fix for gcc 3.3.3.
dev/etherpkt.hh:
Gcc 3.3.3 wants assert.h to be include in this file.
dev/ide_ctrl.cc:
after unserialization we need to tell the busbridges what addresses to
respond to.
--HG--
extra : convert_revision :
a421197a5be07761bdef571d0a9406d77788e270
Ali Saidi [Thu, 10 Jun 2004 21:31:25 +0000 (17:31 -0400)]
move ping_linux.ini into linux-kernel-tsunami dir
--HG--
extra : convert_revision :
da08795d48bd7b82fdfb7443e4ffa7e45c037a0c
Lisa Hsu [Thu, 10 Jun 2004 18:40:51 +0000 (14:40 -0400)]
Merge zizzer.eecs.umich.edu:/bk/linux
into lush.(none):/z/hsul/work/linux
--HG--
extra : convert_revision :
30b93e7a4548a00ba18e86aad85df4c790f51d43
Lisa Hsu [Thu, 10 Jun 2004 18:27:44 +0000 (14:27 -0400)]
fix some things on linux todo list. 1) the config.ini. 2) the etherpkt struct defs into ined_hdrs.hh
3) add some new functions to etherpkt. 4) checkin the nice ping_linux.ini that i've been using.
dev/etherpkt.hh:
remove the packet headers nate hated so much.
also add some new functionality regarding packets, like isIpHdr(), etc.
dev/ns_gige.cc:
improve the code given the nice new functions offered in etherpkt
--HG--
extra : convert_revision :
2e27f5a8dca5323c0fa22d3c51af44a35f6be1a2
Ali Saidi [Thu, 10 Jun 2004 17:30:58 +0000 (13:30 -0400)]
Fixes for detailed boot, made cttz and ctlz instructions more compact,
and started cleaning up config files.
arch/alpha/isa_desc:
Made implementation of cttz and ctlz more compact
base/remote_gdb.cc:
Added comment about PALcode debugger accesses
dev/baddev.cc:
dev/baddev.hh:
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
dev/tsunami_uart.cc:
dev/tsunami_uart.hh:
Cleaned up includes and changed device from FunctionalMemory to
PioDevice for detailed boot
dev/ns_gige.cc:
The ethernet dev uses two BARs, and the first bars size was being set
incorrectly.
dev/tsunamireg.h:
I don't know why we were using the superpage as the PCI memory addr.
Changed and works correctly with detailed boot.
--HG--
extra : convert_revision :
b535e76612cb90b544305dc1aa8c5e0e774564bd
Lisa Hsu [Thu, 10 Jun 2004 05:14:35 +0000 (01:14 -0400)]
lift common code *kernel_stats.* into the kern directory.
cpu/exec_context.hh:
lift kernel_stats out in the linux tree.
--HG--
extra : convert_revision :
866c7f82d8b995b4dce295de1ab0980527d13f01
Andrew Schultz [Thu, 10 Jun 2004 05:00:47 +0000 (01:00 -0400)]
Change SCSI controller back to original M5 controller and remove the
Adaptec additions (will stay in BitKeeper revision history)
--HG--
extra : convert_revision :
f2e073fd5a34332e6f4b780bde6b948b486e3f68
Ali Saidi [Tue, 8 Jun 2004 17:47:45 +0000 (13:47 -0400)]
Extra semicolon removed
--HG--
extra : convert_revision :
fca7af81cfa4256acc1f2fb667196ca7411d754f
Ali Saidi [Tue, 8 Jun 2004 17:37:27 +0000 (13:37 -0400)]
Updated Copyright with information in bitkeeper changelogs
arch/alpha/alpha_linux_process.cc:
arch/alpha/alpha_linux_process.hh:
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
arch/alpha/alpha_tru64_process.cc:
arch/alpha/alpha_tru64_process.hh:
arch/alpha/aout_machdep.h:
arch/alpha/arguments.cc:
arch/alpha/arguments.hh:
arch/alpha/faults.cc:
arch/alpha/faults.hh:
arch/alpha/isa_traits.hh:
arch/alpha/osfpal.cc:
arch/alpha/osfpal.hh:
arch/alpha/pseudo_inst.cc:
arch/alpha/pseudo_inst.hh:
arch/alpha/vptr.hh:
arch/alpha/vtophys.cc:
arch/alpha/vtophys.hh:
base/bitfield.hh:
base/callback.hh:
base/circlebuf.cc:
base/circlebuf.hh:
base/compression/lzss_compression.cc:
base/compression/lzss_compression.hh:
base/compression/null_compression.hh:
base/cprintf.cc:
base/cprintf.hh:
base/cprintf_formats.hh:
base/date.cc:
base/dbl_list.hh:
base/endian.hh:
base/fast_alloc.cc:
base/fast_alloc.hh:
base/fifo_buffer.cc:
base/fifo_buffer.hh:
base/hashmap.hh:
base/hostinfo.cc:
base/hostinfo.hh:
base/hybrid_pred.cc:
base/hybrid_pred.hh:
base/inet.cc:
base/inet.hh:
base/inifile.cc:
base/inifile.hh:
base/intmath.cc:
base/intmath.hh:
base/loader/aout_object.cc:
base/loader/aout_object.hh:
base/loader/ecoff_object.cc:
base/loader/ecoff_object.hh:
base/loader/elf_object.cc:
base/loader/elf_object.hh:
base/loader/object_file.cc:
base/loader/object_file.hh:
base/loader/symtab.cc:
base/loader/symtab.hh:
base/misc.cc:
base/misc.hh:
base/mod_num.hh:
base/mysql.cc:
base/mysql.hh:
base/pollevent.cc:
base/pollevent.hh:
base/predictor.hh:
base/random.cc:
base/random.hh:
base/range.cc:
base/range.hh:
base/refcnt.hh:
base/remote_gdb.cc:
base/remote_gdb.hh:
base/res_list.hh:
base/sat_counter.cc:
base/sat_counter.hh:
base/sched_list.hh:
base/socket.cc:
base/socket.hh:
base/statistics.cc:
base/statistics.hh:
base/stats/events.cc:
base/stats/events.hh:
base/stats/flags.hh:
base/stats/mysql.cc:
base/stats/mysql.hh:
base/stats/mysql_run.hh:
base/stats/output.hh:
base/stats/statdb.cc:
base/stats/statdb.hh:
base/stats/text.cc:
base/stats/text.hh:
base/stats/types.hh:
base/stats/visit.cc:
base/stats/visit.hh:
base/str.cc:
base/str.hh:
base/time.cc:
base/time.hh:
base/trace.cc:
base/trace.hh:
base/userinfo.cc:
base/userinfo.hh:
cpu/base_cpu.cc:
cpu/base_cpu.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/exetrace.cc:
cpu/exetrace.hh:
cpu/full_cpu/op_class.hh:
cpu/full_cpu/smt.hh:
cpu/inst_seq.hh:
cpu/intr_control.cc:
cpu/intr_control.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
cpu/pc_event.cc:
cpu/pc_event.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
cpu/static_inst.cc:
cpu/static_inst.hh:
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/baddev.cc:
dev/baddev.hh:
dev/disk_image.cc:
dev/disk_image.hh:
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.cc:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/etherpkt.cc:
dev/etherpkt.hh:
dev/ethertap.cc:
dev/ethertap.hh:
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/io_device.cc:
dev/io_device.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/ns_gige_reg.h:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/pcireg.h:
dev/platform.cc:
dev/platform.hh:
dev/simple_disk.cc:
dev/simple_disk.hh:
dev/tsunami.cc:
dev/tsunami.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
dev/tsunami_uart.hh:
dev/tsunamireg.h:
docs/stl.hh:
kern/linux/linux.hh:
kern/linux/linux_syscalls.cc:
kern/linux/linux_syscalls.hh:
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
kern/system_events.cc:
kern/system_events.hh:
kern/tru64/dump_mbuf.cc:
kern/tru64/dump_mbuf.hh:
kern/tru64/mbuf.hh:
kern/tru64/printf.cc:
kern/tru64/printf.hh:
kern/tru64/tru64.hh:
kern/tru64/tru64_events.cc:
kern/tru64/tru64_events.hh:
kern/tru64/tru64_syscalls.cc:
kern/tru64/tru64_syscalls.hh:
kern/tru64/tru64_system.cc:
kern/tru64/tru64_system.hh:
sim/async.hh:
sim/builder.cc:
sim/builder.hh:
sim/debug.cc:
sim/debug.hh:
sim/eventq.cc:
sim/eventq.hh:
sim/host.hh:
sim/main.cc:
sim/param.cc:
sim/param.hh:
sim/process.cc:
sim/process.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/sim_events.cc:
sim/sim_events.hh:
sim/sim_exit.hh:
sim/sim_object.cc:
sim/sim_object.hh:
sim/stat_control.cc:
sim/stat_control.hh:
sim/stats.hh:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
sim/system.cc:
sim/system.hh:
sim/universe.cc:
test/bitvectest.cc:
test/circletest.cc:
test/cprintftest.cc:
test/initest.cc:
test/lru_test.cc:
test/nmtest.cc:
test/offtest.cc:
test/paramtest.cc:
test/rangetest.cc:
test/sized_test.cc:
test/stattest.cc:
test/strnumtest.cc:
test/symtest.cc:
test/tokentest.cc:
test/tracetest.cc:
util/m5/m5.c:
util/m5/m5op.h:
util/tap/tap.cc:
Updated Copyright
dev/console.cc:
dev/console.hh:
This code isn't ours, and shouldn't have our copyright
--HG--
extra : convert_revision :
598f2e5eab5d5d3de2c1e862b389086e3212f7c4
Ali Saidi [Sun, 6 Jun 2004 23:31:06 +0000 (19:31 -0400)]
Merge saidi@zizzer:/z/m5/Bitkeeper/linux/
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
9fa64783d4f5d03acff5d11cba61e46590d6a9dd
Ali Saidi [Sun, 6 Jun 2004 23:30:52 +0000 (19:30 -0400)]
Updated to use new palcode with ctlz instruction
--HG--
extra : convert_revision :
fbea7f01c528ae472845ec2897c9405afb145417
Ali Saidi [Fri, 4 Jun 2004 22:10:50 +0000 (18:10 -0400)]
Added ctlz and cttz instructions to isa_desc for use in the PAL code.
--HG--
extra : convert_revision :
74dec35113b795e792b7fc03947a05349a4ff669
Andrew Schultz [Fri, 4 Jun 2004 20:04:55 +0000 (16:04 -0400)]
Fix to TsunamiIO unserialize
dev/tsunami_io.cc:
Timers don't need to be rescheduled cause they aren't scheduled by
the default constructor
--HG--
extra : convert_revision :
afb68e4f0c4e2a2c98f0037e061752690080a503
Andrew Schultz [Fri, 4 Jun 2004 19:13:04 +0000 (15:13 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
b23a1d1a79ac5c593150d269d0523c474cf6a4a0
Andrew Schultz [Fri, 4 Jun 2004 19:12:27 +0000 (15:12 -0400)]
Changes to support serialization with PCI devices
dev/ide_ctrl.cc:
Properly serialize/unserialize the PciDev base class to get it to remap
the MMU
dev/ns_gige.cc:
dev/ns_gige.hh:
Remove the "addr" paramter from the constructor and change the device
to use PCI based MMU mappings only
dev/pciconfigall.cc:
Change comments
dev/pcidev.cc:
Properly setup the MMU after a serialize
--HG--
extra : convert_revision :
4b2e7ba58e3c24fac1ff6f80635e704d6ecc0eff
Ali Saidi [Fri, 4 Jun 2004 18:26:17 +0000 (14:26 -0400)]
fixed serialization in tsunami_io and tsunami_uart and console
dev/console.cc:
dev/tsunami_io.cc:
dev/tsunami_uart.cc:
fixed serialization
--HG--
extra : convert_revision :
1608a116b00007922fa382ddb0c10442a8724f8d
Ali Saidi [Fri, 4 Jun 2004 17:46:04 +0000 (13:46 -0400)]
Merge
dev/tsunami_pchip.cc:
SCCS merged
--HG--
extra : convert_revision :
064e3bab82aacf813d1f049d72429fd990608044
Ali Saidi [Fri, 4 Jun 2004 17:43:50 +0000 (13:43 -0400)]
Updated copyright on Tsunami and kern/linux files.
dev/baddev.cc:
dev/baddev.hh:
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/pcireg.h:
dev/platform.cc:
dev/platform.hh:
dev/tsunami.cc:
dev/tsunami.hh:
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
kern/linux/linux.hh:
kern/linux/linux_syscalls.cc:
kern/linux/linux_syscalls.hh:
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
Updated copyright
dev/tsunamireg.h:
Updated copyright and fixed a ULL
--HG--
extra : convert_revision :
4800bd227c7064044ee98169d6a91f74c791956f
Andrew Schultz [Thu, 3 Jun 2004 21:48:05 +0000 (17:48 -0400)]
Fixes in translation in PCI to DMA address to fix boot problems with
Linux 2.6 with DMA support
dev/ide_disk.cc:
Add debug infomation for DMA transfers and fix handling of PRD pointer
values
dev/ide_disk.hh:
Reduce buffer (MAX_DMA) size to 64K
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
Add handling of PCTL register and also fix the translate from PCI to DMA
addresses which was incorrect
--HG--
extra : convert_revision :
562f55fa1c7099ad0f5a23f59dec2c8ec7601d43
Andrew Schultz [Wed, 2 Jun 2004 17:57:08 +0000 (13:57 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
2b4893331f15b07c7f83148f6271d8ced0fcd6be
Lisa Hsu [Wed, 2 Jun 2004 14:03:31 +0000 (10:03 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5 into lush.(none):/z/hsul/work/linux
--HG--
extra : convert_revision :
795698a55e98f67008392725968d4ac0a29b5326
Ali Saidi [Tue, 1 Jun 2004 21:36:38 +0000 (17:36 -0400)]
Removed dynamic cast to get interrupt frequency and replaced with a
virtual function in alphaaccess.cc
dev/alpha_console.cc:
dev/alpha_console.hh:
dev/platform.hh:
dev/tsunami.cc:
dev/tsunami.hh:
dev/tsunami_io.hh:
Removed dynamic cast to get interrupt frequency and replaced with a
virtual function
--HG--
extra : convert_revision :
01f514a33d8f76c6527ab25a713d5c86f9fd646e
Andrew Schultz [Tue, 1 Jun 2004 21:20:30 +0000 (17:20 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
44678cd6aa2fa9e381d5d719d227013f5eb2a45c
Andrew Schultz [Tue, 1 Jun 2004 21:19:47 +0000 (17:19 -0400)]
Fixes to the state machine to properly support software reset and to fix
PIO writes. This was mainly related to not shadowing the status register
properly, and also not setting some of the status bits expected by the
operating system for the PIO write protocol.
--HG--
extra : convert_revision :
fcdfd588be6e4f237aa6057889f0b3bdf4ea7631
Ali Saidi [Tue, 1 Jun 2004 20:03:16 +0000 (16:03 -0400)]
Merge saidi@zizzer:/z/m5/Bitkeeper/m5/
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
89e0bdd427b23a8f52b8ba53b18451df7be22f14
Ali Saidi [Tue, 1 Jun 2004 19:43:27 +0000 (15:43 -0400)]
Added ability to specify system type/revision in config file. This
way a Tru64 system can be either Tlaser (by default) or Tsunami.
Added debugSymbolTable to Tru64 for symbol printing in InstExec Trace
cpu/exetrace.cc:
Fixed bug if debugSymbolTable doesn't exist, we shouldn't try to
look something up in it.
kern/tru64/tru64_system.hh:
Added ability to specify system type/revision in config file. This
way a Tru64 system can be either Tlaser (by default) or Tsunami.
--HG--
extra : convert_revision :
c69a7411f0aa118ca5a766e43b7ceb7a5bb04cdf
Steve Reinhardt [Tue, 1 Jun 2004 00:39:06 +0000 (17:39 -0700)]
Rename OpClass enum in .odesc file too.
--HG--
extra : convert_revision :
cb1824a1b6747fabf44ffcf40b45b71b052b2253
Ali Saidi [Mon, 31 May 2004 23:47:17 +0000 (19:47 -0400)]
Added and cleaned up some comments
dev/tsunami_cchip.hh:
clean up some comments
kern/linux/linux_syscalls.cc:
Cleaned up spacing of syscall numbers
kern/linux/linux_system.hh:
Added doxygen comments
--HG--
extra : convert_revision :
23ecdaa92a208458dd5c5d3c68ac9012ce2690da
Steve Reinhardt [Mon, 31 May 2004 23:19:31 +0000 (16:19 -0700)]
Renamed OpClass enum members: they all end in 'Op' now.
Got rid of two inconsistent sets of strings that corresponded
to this enum, and replaced with a single set that clearly
matches the enum names.
arch/alpha/isa_desc:
arch/isa_parser.py:
cpu/full_cpu/op_class.hh:
Renamed OpClass enum members.
--HG--
extra : convert_revision :
bf596f7568a20b2e77c07ac349f253135141aef4
Ali Saidi [Mon, 31 May 2004 22:58:54 +0000 (18:58 -0400)]
Merged head into linux tree
base/stats/mysql.hh:
Rename of Statsistics namespace to stats... merge from head
--HG--
extra : convert_revision :
a5a7f6268b35e75fba1b1800a74fcd6dbd09d974
Steve Reinhardt [Mon, 31 May 2004 22:22:22 +0000 (15:22 -0700)]
Ignore fast_cpu_exec.cc.
--HG--
extra : convert_revision :
31495fbb3568a09e763978ea59e36cb239090fda
Steve Reinhardt [Mon, 31 May 2004 22:21:14 +0000 (15:21 -0700)]
Add parameter defaults to .odesc files. There was a bug in
extract_odesc.py that caused these to get left out.
--HG--
extra : convert_revision :
32e76c8e699f3dd72937e92217f3ab43fb53b4de
Ali Saidi [Sun, 30 May 2004 21:45:46 +0000 (17:45 -0400)]
Cleaned up and commented code. I think we are ready to merge with head.
dev/baddev.hh:
dev/pcidev.hh:
dev/tsunami.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
Added doxygen comments
dev/pciconfigall.hh:
Added doxygen comments. Made the hlist of devices private and provided
members to modify the data.
dev/pcidev.cc:
updated for change in pciconfigall
dev/tsunami_pchip.cc:
Deleted commented out code we don't need
kern/linux/linux_syscalls.cc:
Simplified the number -> name conversion.
kern/linux/linux_syscalls.hh:
Removed StandardNumber and replaced with Number.
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
LinuxSkipIdeDelay50msEvent was simply the same as the SkipFunc event,
so I removed it. Same with with LinuxSkipFuncEvent.
--HG--
extra : convert_revision :
1508c335f87d90373f5772f3a0407ea13e858d7e
Kevin Lim [Fri, 28 May 2004 18:42:59 +0000 (14:42 -0400)]
Updated FastCPU model with all the recent changes.
arch/alpha/ev5.cc:
Updated to support new forms of setIntReg and setFloatRegDouble. Will need to be cleaned up in the future.
arch/isa_parser.py:
Added in FastCPU model.
--HG--
extra : convert_revision :
384a27efcb50729ea6c3cc11653f395c300e48db
Kevin Lim [Fri, 28 May 2004 15:41:52 +0000 (11:41 -0400)]
Merged in new FastCPU stuff with existing code.
arch/alpha/ev5.cc:
Added templatized processInterrupts() function that can be used by all of the CPU models.
arch/alpha/isa_desc:
Merged in changes to remove CPU dependence.
arch/isa_parser.py:
Merged in changes.
cpu/static_inst.hh:
Includes FastCPU execute methods.
--HG--
extra : convert_revision :
fcaa1dca35a9b316c73982bec8680df564f50bd8
Kevin Lim [Thu, 27 May 2004 21:46:16 +0000 (17:46 -0400)]
FastCPU model added. It's very similar to the SimpleCPU, just without a lot of the stats tracking.
Also various changes to make the CPU model less ISA dependent, which includes moving the code that checks for interrupts up to the ISA level, moving code that zeroes the zero registers up to the ISA level, and removing opcode and ra from the regfile.
arch/alpha/alpha_memory.cc:
The regfile has been changed so it no longer has the opcode and ra. Instead the xc holds the actual instruction, and from there the opcode and ra can be obtained with OPCODE() and RA().
arch/alpha/ev5.cc:
Moved code that once existed within simpleCPU to ev5, and templatized it.
This way the CPU models can call processInterrupts and the ISA specific interrupt handling is left to the ISA's code.
Also moved ISA specific zero registers from simpleCPU to here.
arch/alpha/ev5.hh:
Added macros for obtaining the opcode and ra from the instruction itself, as there is no longer opcode or ra in the regfile.
arch/alpha/isa_desc:
Added in declarations for the FastCPU model.
arch/alpha/isa_traits.hh:
Removed opcode and ra from the regfile. The xc now holds the actual instruction, and the opcode and ra can be obtained through it.
Also added the declaration for the templated zeroRegisters() function, which will set the zero registers to 0.
arch/isa_parser.py:
Added in FastCPUExecContext so it will generate code for the FastCPU model as well.
cpu/exec_context.cc:
Added in a more generic trap function so "ev5_trap" doesn't need to be called. It currently still calls the old method, with plans for making this ISA dependent in the future.
cpu/exec_context.hh:
Exec context now has the instruction within it. Also added methods for exec context to read an instruction from memory, return the current instruction, and set the instruction if needed.
Also has declaration for more generic trap() function.
cpu/simple_cpu/simple_cpu.cc:
Removed references to opcode and ra, and instead sets the xc's instruction with the fetched instruction.
cpu/static_inst.hh:
Added declaration for execute() using FastCPUExecContext.
--HG--
extra : convert_revision :
0441ea3700ac50b733e485395d4dd4ac83666f92
Ali Saidi [Thu, 27 May 2004 18:20:50 +0000 (14:20 -0400)]
test to see if pushing to m5-tru64 triggers an e-mail
--HG--
extra : convert_revision :
df7aab669a8521d031c7202e36c3c086fa979854
Steve Reinhardt [Thu, 27 May 2004 18:12:49 +0000 (14:12 -0400)]
postint, postext:
Fix output path /m5 -> /z/m5
--HG--
extra : convert_revision :
11ebcc7e62f02be8b0aeb8857eebc33a27e29513
Steve Reinhardt [Thu, 27 May 2004 18:06:39 +0000 (14:06 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
38d50d3d3640f02622e5ace5ac12b67d63eda3f0
Steve Reinhardt [Thu, 27 May 2004 18:06:29 +0000 (14:06 -0400)]
config_files.doxygen:
Apparently <> don't need backslashes if they're inside dbl-quoted strings.
--HG--
extra : convert_revision :
dd5294781d0ef818d1a5b622f3415510baefb402
Andrew Schultz [Thu, 27 May 2004 02:39:36 +0000 (22:39 -0400)]
base_linux.ini:
Change disk image COW layer to be anonymous.
--HG--
extra : convert_revision :
f0829acb26166fb0d63ed84f86288e973bf59a6a
Ali Saidi [Wed, 26 May 2004 22:49:24 +0000 (18:49 -0400)]
removal of bootloader from config file, merged
--HG--
extra : convert_revision :
9168d939d4e707b00be6609368b592a0829a7226
Ali Saidi [Wed, 26 May 2004 22:48:11 +0000 (18:48 -0400)]
Fixed serial support in 2.6 (too much work for...)
Removed bootloader and just wrote command line into linux kernel
base/inifile.cc:
the forked process should not return, it should exit.
dev/tsunami_uart.cc:
dev/tsunami_uart.hh:
The serial port in reality has some delay and linux expects it. This
schedules an interrupt 300 cycles after the transmit instead of
immediately
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
removed boot loader and stuck boot command line in the kernel manually
--HG--
extra : convert_revision :
68aa54f8ca4e8391789f7a4c1ae227e6f8b94e13
Lisa Hsu [Wed, 26 May 2004 17:06:32 +0000 (13:06 -0400)]
this now pings in single-user mode, so it should ping in other modes fine as well.
dev/ns_gige.cc:
remove some useless DPRINTF's and add some useful ones. fix the missing RXDESC interrupt.
--HG--
extra : convert_revision :
17142480db1eaafa24f88640f8c7b8e7e077de1a
Andrew Schultz [Tue, 25 May 2004 20:36:20 +0000 (16:36 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
67753db3defad3c44640df09a9465670f1667800
Andrew Schultz [Tue, 25 May 2004 20:35:18 +0000 (16:35 -0400)]
Varied fixes to get linux running. Allow for shutdown on linux.
dev/ide_disk.cc:
Fix to PIO writes and also add command needed for shutdown
dev/pcidev.cc:
Change the panic on write to read-only registers to a debug print. The
kernel tries to write back over all of the PCI registers to restore
the saved SRM state, so we need to let it do this without panicing.
sim/system.cc:
Add back increment of number of running systems to allow trap of halt
work correctly.
--HG--
extra : convert_revision :
84aba4effbec14545f3610c19a8e321d7e7f7cf2
Ali Saidi [Tue, 25 May 2004 19:59:54 +0000 (15:59 -0400)]
Changed name of lisa's device to NSgigE instead of Etherdev so it
doesn't conflict with the old ethernet driver name.
Added config file to try to boot Tru64 with Tsunami
Cleaned up kern/linux a bit more and fixed bug where we were using
Tru64 system calls
dev/ns_gige.cc:
dev/ns_gige.hh:
dev/tsunami.hh:
Changed name of lisa's device to NSgigE instead of Etherdev so it
doesn't conflict with the old ethernet driver name.
kern/linux/linux_syscalls.hh:
the Syscalls still used the Tru64 calls, oops.. fixed.
--HG--
extra : convert_revision :
dedd20686cc367ed37f31920f753566afbc69045
Andrew Schultz [Mon, 24 May 2004 22:58:27 +0000 (18:58 -0400)]
Fix to the PIO read state machine (write still needs fixes)
--HG--
extra : convert_revision :
2e8afcfe3448d921b26ebb76e65c0b237339e9b1
Ali Saidi [Mon, 24 May 2004 19:06:21 +0000 (15:06 -0400)]
parser.out and parser.py shouldn't have been added to the repository
--HG--
extra : convert_revision :
c6a66243f5a1ec0f05d4233a0652a47db1ceba25
Ali Saidi [Mon, 24 May 2004 16:38:00 +0000 (12:38 -0400)]
Merge zeep.eecs.umich.edu:/.automount/zizzer/z/m5/Bitkeeper/linux
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
4c0755b9c3b19f928006da227edc335d328a9efe
Ali Saidi [Mon, 24 May 2004 16:37:45 +0000 (12:37 -0400)]
removed mbuf code from linux since it only exists in tru64
--HG--
extra : convert_revision :
b1dbd8a143b7c1204bf57f6964880f957242d4fb
Nathan Binkert [Sun, 23 May 2004 16:53:34 +0000 (12:53 -0400)]
make the interaction of the stats event stuff with the
database work better.
base/stats/events.cc:
properly connect to the database
base/stats/mysql.cc:
cleanup the event stuff too
--HG--
extra : convert_revision :
f05fd6456decc9c4f95beff5c12497439e45f886
Nathan Binkert [Fri, 21 May 2004 19:06:04 +0000 (15:06 -0400)]
fix column name for indexes
--HG--
extra : convert_revision :
34831eed6b218e470096f010438fd2f32a4960c5
Nathan Binkert [Fri, 21 May 2004 17:58:39 +0000 (13:58 -0400)]
add a few statistics events
arch/alpha/ev5.cc:
Add an event for faults
cpu/simple_cpu/simple_cpu.cc:
add events for uncached reads/writes
--HG--
extra : convert_revision :
747bdf12761e2de6ebbf54fecc9e0b71915b3a02
Nathan Binkert [Fri, 21 May 2004 17:57:44 +0000 (13:57 -0400)]
Add support for event tracking. Esentially this puts a sequence
of events into the database for a given run.
base/stats/mysql.cc:
base/stats/mysql.hh:
reorganize mysql stat stuff so that other stuff can use
the same database connection
base/traceflags.py:
Trace flag to print out events
--HG--
extra : convert_revision :
4d502532ed0ba40b42baefee46b2c99defcc620c
Nathan Binkert [Fri, 21 May 2004 17:39:20 +0000 (13:39 -0400)]
rename namespace Statistics to Stats
--HG--
extra : convert_revision :
28f1703f8d7d8cf33fb952ae450f66bdba860fb7
Nathan Binkert [Fri, 21 May 2004 17:03:17 +0000 (13:03 -0400)]
Change the namespace Statistics to Stats
--HG--
extra : convert_revision :
3084b292bbe2e8a392af8e99a31763ca0b0a9467
Erik Hallnor [Fri, 21 May 2004 03:26:44 +0000 (23:26 -0400)]
Update the adaptive cache compression scheme.
--HG--
extra : convert_revision :
50c158b0545c29c03e346f1bd2952951ac77659b
Nathan Binkert [Thu, 20 May 2004 02:00:30 +0000 (22:00 -0400)]
Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
d5f03880c6564b80f662a467524c79aa90b1a0b0
Nathan Binkert [Thu, 20 May 2004 01:54:05 +0000 (21:54 -0400)]
Replaced by python
--HG--
extra : convert_revision :
5c95c2b3169b8b1a51166d7f8fcde3de39fa30f9
Andrew Schultz [Wed, 19 May 2004 19:58:24 +0000 (15:58 -0400)]
Remove the uncacheable bit 39 check (needs to be merged in with head tree
if Tru64 is to continue to be supported on Turbolaser) and fixed
translation of physical addresses by clearing PA<42:35> when the real
uncachable bit (43) is set
arch/alpha/ev5.hh:
Change to support 256 ASNs and seperate VA_SPACE checks for EV5 and EV6
also add support proper translation of uncacheable physical addresses
dev/ide_ctrl.cc:
Fix to work with real address translation
--HG--
extra : convert_revision :
aa3d1c284b8271d4763a8da2509c91bbcf83189a
Steve Reinhardt [Wed, 19 May 2004 05:09:13 +0000 (22:09 -0700)]
Add a level of indirection to the register accessors used in
instruction execute methods. Register i now means the instruction's
i'th src (or dest) operand, not architectural register i. Current
models that use the architectural reg index can look that up easily
in the instruction object. Future models that do register renaming
should find this much simpler to deal with.
arch/isa_parser.py:
Generate register accessors with an extra level of indirection.
cpu/simple_cpu/simple_cpu.hh:
Modify register accessors to use an extra level of indirection.
--HG--
extra : convert_revision :
f4c7d6bfa92fb2ea6251f31ee368809c3643f08f
Steve Reinhardt [Tue, 18 May 2004 23:09:02 +0000 (16:09 -0700)]
Replace explicit xc->misspeculating() tests in execute() methods
with an IsNonSpeculative flag.
No effect on results of non-full-system or SimpleCPU.
Very small impact on full-system FullCPU runs since old wrong-path
call_pal insts used to change the PC, where now they're treated
as no-ops.
arch/alpha/isa_desc:
Get rid of xc->misspeculating() checks, use IsNonSpeculative flag instead.
cpu/static_inst.hh:
Add IsNonSpeculative flag and isNonSpeculative() method to test it.
--HG--
extra : convert_revision :
7ec536bfc28b905c429c09eb920ed73ef2beeeba
Lisa Hsu [Tue, 18 May 2004 18:30:17 +0000 (14:30 -0400)]
fix the indefinite interrupting of the ethernet device.
dev/ns_gige.cc:
clear the device interrupts
dev/ns_gige_reg.h:
Add a new mask
--HG--
extra : convert_revision :
ce3617315677cbee577ed8893821a8abc5a1a10d
Lisa Hsu [Tue, 18 May 2004 17:53:11 +0000 (13:53 -0400)]
lift FnEvents and and Binning stuff out of LinuxSystem into commonn places with Tru64.
kern/linux/linux_system.cc:
add binned_fns parameter to System, remove nonLinux events from LinuxSystem, fix ~LinuxSystem() by adding delete of some things that need to be deleted.
kern/linux/linux_system.hh:
fix header file to go with linux_system.cc, removing nonLinux events and adding binned_fns param.
kern/tru64/tru64_system.cc:
add somme consistency by having having binned_fns be _binned_fns in the Tru64System arg list.
--HG--
extra : convert_revision :
b2ec0c1614e185aafa177c220b91d1f6a4fe6876
Lisa Hsu [Tue, 18 May 2004 05:40:03 +0000 (01:40 -0400)]
merge m5 with linux for the event and binning lifting
--HG--
extra : convert_revision :
09d3678746c2e9a93a9982dc75d5e1ac309cb2fa
Steve Reinhardt [Mon, 17 May 2004 19:10:28 +0000 (12:10 -0700)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
4dae71fe3482737a22745b27c2ca6983191c4a18
Lisa Hsu [Mon, 17 May 2004 19:08:24 +0000 (15:08 -0400)]
lift system-independent binning stuff out of Tru64System into System.
kern/tru64/tru64_system.cc:
make binned_fns a parameter for System in addition to Tru64System. Do all the fnEvents setting at the System level, since that is system-independent.
kern/tru64/tru64_system.hh:
deal with FnEvents in the System, and move some fns over to System.
sim/system.cc:
sim/system.hh:
lift binning stuff into System out of Tru64System
--HG--
extra : convert_revision :
591dee6f2013f5c43037726c529a00682b5cf82e
Steve Reinhardt [Mon, 17 May 2004 18:50:02 +0000 (11:50 -0700)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
266d03e82a04cca07f669f778ad11907f2f003d2
Steve Reinhardt [Mon, 17 May 2004 18:49:46 +0000 (11:49 -0700)]
Significant changes to ISA description to completely factor
out CPU model. ISA description now generates multiple
output source files to (in theory) reduce compilation time.
arch/alpha/isa_desc:
Update for parser changes. Move most constructors
out of class declarations (which are now in decoder.hh)
and into decoder.cc. Move all execute() methods into
exec output.
arch/isa_parser.py:
Significant changes to make ISA description completely
independent of CPU model, and isolate model-dependent parts
of parser into one little class (CpuModel). Also split up code
output into multiple files (a header, a main source file, and
per-cpu execute() method files).
Noticeable changes to language as a result. See updated Doxygen
documentation.
cpu/simple_cpu/simple_cpu.hh:
SimpleCPUExecContext typedef no longer needed.
Add forward declaration of Process.
cpu/static_inst.hh:
SimpleCPUExecContext and FullCPUExecContext typedefs no longer needed.
Make eaCompInst() and memAccInst() return const refs.
--HG--
extra : convert_revision :
71471f267804fafd0a881bac7445677e76334daf
Lisa Hsu [Mon, 17 May 2004 17:22:19 +0000 (13:22 -0400)]
push the new system_events file that i was prevented from pushing way back when cable died. :(. also, fix the printing of binned stats, it was printing hex values instead of bin names.
base/stats/text.cc:
fix the printing of binned stats.
--HG--
extra : convert_revision :
3a04d004f5ea1d90536f7102fce946fd6dd34613
Andrew Schultz [Mon, 17 May 2004 15:51:26 +0000 (11:51 -0400)]
Changes to let system boot with COW image
--HG--
extra : convert_revision :
f98f05834c2d3dc07448b17596247f17e7b73cfd
Lisa Hsu [Mon, 17 May 2004 14:40:45 +0000 (10:40 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/m5
--HG--
extra : convert_revision :
fb775c1ed5ac9712929bbd7186b9ab13e90e2dc1
Nathan Binkert [Sun, 16 May 2004 15:41:41 +0000 (11:41 -0400)]
Now that the generation stuff is working, make the gendir
work correctly.
--HG--
extra : convert_revision :
08a5147f5a5cac46800eeef47b4a23451a1139c2
Nathan Binkert [Sun, 16 May 2004 13:28:06 +0000 (09:28 -0400)]
Make the build process deal with the target arch directory
and generated files a bit better.
--HG--
extra : convert_revision :
e2216289bb53fd231e228c2d9d740317c00991bb
Ali Saidi [Fri, 14 May 2004 21:39:32 +0000 (17:39 -0400)]
manual merge of linux_system and makefile
kern/linux/linux_system.cc:
merged
--HG--
extra : convert_revision :
81ef6a46f76968985f44c72f296a79ea77e73d12
Ali Saidi [Fri, 14 May 2004 21:34:15 +0000 (17:34 -0400)]
Linux boots... various fixes to make console work correctly
dev/console.cc:
commented out code that checks if an interrupt is happening before issuing one
because they can get lost when linux boots
dev/console.hh:
added a setPlatform function to set the platform to interrupt
dev/platform.hh:
dev/tsunami.cc:
dev/tsunami.hh:
Added virtual functions to post console interrupts
dev/tsunami_io.cc:
allowed a 64bit read of the PIC since we can't do a physical byte read
dev/tsunami_uart.cc:
moved TsunamiUart to PioDevice
various little fixes to make linux work
dev/tsunami_uart.hh:
Made Tsunami_Uart a PIO device
dev/tsunamireg.h:
added some UART defines and used the ULL macros
kern/linux/linux_system.cc:
commented out waiting for gdb
--HG--
extra : convert_revision :
8cfd0700f3812ab349a6d7f132f85f4f421c5c5e
Lisa Hsu [Thu, 13 May 2004 15:40:22 +0000 (11:40 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into shizzle.(none):/home/hsul/work/m5
--HG--
extra : convert_revision :
e47c4db52bdf074b596591f145ffb1a6443d63a4
Lisa Hsu [Thu, 13 May 2004 15:40:07 +0000 (11:40 -0400)]
lift some things out of the tru64 directory into common directory so linux can use it without replication later.
kern/tru64/tru64_events.cc:
kern/tru64/tru64_events.hh:
lift out SkipFuncEvent and FnEvents since these can be used by any OS.
kern/tru64/tru64_system.cc:
add system_events (the common OS events file)
--HG--
extra : convert_revision :
4d7a843d67459af4d77e433ae3c1b0fbc5f0b56b
Nathan Binkert [Thu, 13 May 2004 12:08:42 +0000 (08:08 -0400)]
Add VPtr class that makes it possible to esentially create
a pointer to an object that lives inside simulated memory.
Useful for doing a bit of analysis of what's going on in
the running kernel.
--HG--
extra : convert_revision :
d78089cce5ec4334483a710ba512eaf18d9b0319
Nathan Binkert [Thu, 13 May 2004 12:03:36 +0000 (08:03 -0400)]
remove the annotation junk
arch/alpha/isa_desc:
remove the annotation junk
Move some code to AlphaPseudo where it belongs
arch/alpha/pseudo_inst.cc:
arch/alpha/pseudo_inst.hh:
remove the annotation junk
add pseudo instruction code that was previously misplaced
--HG--
extra : convert_revision :
97db8402aa34e0bdf044b138c52331fc9e714986
Nathan Binkert [Thu, 13 May 2004 11:28:54 +0000 (07:28 -0400)]
pass the address of both the old an new pcbb on context
switches. (Makes other uncommitted code easier to merge.)
arch/alpha/ev5.cc:
pass the address of both the old an new pcbb on context
switches
--HG--
extra : convert_revision :
bff8c8d1b532ad5f9af6270169bbfb1b5c05256a
Nathan Binkert [Thu, 13 May 2004 11:00:31 +0000 (07:00 -0400)]
wrap mbuf stuff in the tru64 namespace since other OSes
may be different
--HG--
extra : convert_revision :
75ea218b5219c7a2b5bf7dca7c52dfff22740478
Nathan Binkert [Thu, 13 May 2004 10:59:05 +0000 (06:59 -0400)]
Avoid sending a signal to ourselves if we're not debugging
--HG--
extra : convert_revision :
d6ba1ce30bad4a44d716238a8107c3bff0ce89c4
Andrew Schultz [Wed, 12 May 2004 20:55:49 +0000 (16:55 -0400)]
Fixes to DMA writing (still unverified) and added serialize/unserialize
dev/ide_ctrl.cc:
Added serialize/unserialize functions and move some inlined functions
to regular functions
dev/ide_ctrl.hh:
Change inlined functions to regular functions
dev/ide_disk.cc:
Changes to dmaWrite and also add serialize/unserialize functions
dev/ide_disk.hh:
Support for serializing/unserializing
--HG--
extra : convert_revision :
40e016dc7f6637b033fe33409338437c985a05f4
Nathan Binkert [Wed, 12 May 2004 19:49:01 +0000 (15:49 -0400)]
Make a new stat type of Value which is a scalar stat that
proxies for a real C/C++ scalar value or scalar functor.
This replaces the scalar() and functor() terms that were
previously used in formulas. This helps when dumping
statistics because the formulas are not supposed to change.
cpu/base_cpu.cc:
Add a number of cycles stat to the cpu object that tracks the
number of cycles that the cpu has executed. This starts to pave
the way for cpu cycles being different from event ticks.
cpu/base_cpu.hh:
provide a functor for calculating all simulated instructions
of all CPUs and a virtual function for determining that number.
To deal with the change from functor() to Value::functor()
cpu/simple_cpu/simple_cpu.cc:
simTicks -> numCycles
numInsts is now a real Scalar stat, not a Formula
cpu/simple_cpu/simple_cpu.hh:
numInsts is now a real Scalar stat, not a Formula
count all instructions
sim/stat_control.cc:
simInsts, simTicks, hostMemory, and hostSeconds are no
longer Statistics::Formula but rather Statistics::Value
add new stat for tick frequency
sim/stats.hh:
don't need everything to be extern.
test/Makefile:
Make stuff work a tad bit better
test/stattest.cc:
test out Statistics::Value
--HG--
extra : convert_revision :
c812e8baa2b17c08abf3a68ed1e1125dc6f2cfb4
Lisa Hsu [Wed, 12 May 2004 02:42:57 +0000 (22:42 -0400)]
Merge zizzer.eecs.umich.edu:/bk/linux
into shizzle.(none):/home/hsul/work/linux
--HG--
extra : convert_revision :
729b97489f990bffd23add762582b73d2eb2137d
Lisa Hsu [Wed, 12 May 2004 02:42:45 +0000 (22:42 -0400)]
successful merge, linux still builds and runs as far it used to, network device still transmit ARP packet.
arch/alpha/alpha_memory.cc:
change to the main m5 tree convention for naming
base/traceflags.py:
add ide and pciconfigall traceflags
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
kill some old binning styled stuff
--HG--
extra : convert_revision :
0558878906817975a714b1c7c08f9ee405468535
Andrew Schultz [Tue, 11 May 2004 22:09:45 +0000 (18:09 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
879834af81a124b1f1b546f1591713a8c36913e4
Andrew Schultz [Tue, 11 May 2004 22:06:50 +0000 (18:06 -0400)]
Changes to fix bad DMA handling by disk when using scatter gather page
mappings (writes still unverified, and read could probably be looked over
a bit more too)
dev/ide_disk.cc:
dev/ide_disk.hh:
Major changes to fix bogus handling of dma transfers. The read seems to
work pretty well, but the write is unverfied until we can get a disk
image that actually tries to write.
dev/tsunami_pchip.cc:
Change mask to properly mask 13 bits not 12
--HG--
extra : convert_revision :
08fe9bc32970e449cd045de479553a96a4e389d6
Lisa Hsu [Tue, 11 May 2004 05:15:18 +0000 (01:15 -0400)]
first pass at merging m5 with linux
--HG--
extra : convert_revision :
dfe23349b80ae3b34d3cb95c5734e01ef62f700e