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
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
Steve Reinhardt [Tue, 11 May 2004 02:21:04 +0000 (22:21 -0400)]
dma_bus_interface_impl.hh:
Fix template param (breaks on g++ 3.3).
--HG--
extra : convert_revision :
b469aa9aab105bbc5a72a20a48a4abd2e218ff8c
Steve Reinhardt [Mon, 10 May 2004 23:10:47 +0000 (16:10 -0700)]
Do a better job of factoring out CPU model in ISA description.
(Still not perfect though.)
arch/alpha/isa_desc:
Do a better job of factoring out CPU model. (Still not perfect though.)
Pull execute() methods out of class declarations into separate section
of file, allowing (1) easier replication for different CPU models and
(2) a path to putting them all in a separate file. Force all instruction
execution context into a single model-dependent class (SimpleCPU itself
for SimpleCPU, DynInst for FullCPU).
arch/isa_parser.py:
Do a better job of factoring out CPU model. (Still not perfect though.)
Pull execute() methods out of class declarations into separate section
of file, allowing (1) easier replication for different CPU models and
(2) a path to putting them all in a separate file.
Also restructure top level to allow parser to run under interactive
interpreter session for easier debugging.
cpu/exec_context.hh:
Add a few new methods to clean up isa_desc.
cpu/simple_cpu/simple_cpu.cc:
cpu/static_inst.hh:
StaticInst::execute no longer takes a CPU and an ExecContext,
just a unified FooCPUExecContext.
cpu/simple_cpu/simple_cpu.hh:
Add methods to redirect calls to ExecContext so SimpleCPU
can act as sole instruction execution context for itself.
Typedef SimpleCPU to SimpleCPUExecContext.
--HG--
extra : convert_revision :
ecc445503bc585585da5663fe61796580e744da6
Ali Saidi [Mon, 10 May 2004 00:14:18 +0000 (20:14 -0400)]
Added ULL for 64bit ints
Added function to skip determine_cpu_caches(). We may have to update this in the
future: see note below.
arch/alpha/alpha_memory.cc:
dev/ide_ctrl.cc:
dev/tsunamireg.h:
Added ULL for 64bit ints
kern/linux/linux_system.cc:
Added a function to skip determine_cpu_caches, right now it is only used for
printing in proc, however in the future we may either want to implement the SC_CTL
IPR register or manually set alpha_l1i_cacheshape, alpha_l1d_cacheshape,
alpha_l2_cacheshape, alpha_l3_cacheshape to ((size << 10) | (linesize>>1)<<4 | way)
kern/linux/linux_system.hh:
added event to skip determine_cpu_caches()
--HG--
extra : convert_revision :
1065f2091bbe6832b730af490f5b4672c2afedce
Steve Reinhardt [Sun, 9 May 2004 06:32:30 +0000 (23:32 -0700)]
Very minor fixes.
util/tracediff:
stats:file option is now stats:text_file
--HG--
extra : convert_revision :
74b6294da0003345e84bc1533d536dab271b6033
Steve Reinhardt [Sat, 8 May 2004 02:20:30 +0000 (19:20 -0700)]
Merge
--HG--
extra : convert_revision :
7999c243a80482b9feffdf8f3dd4ff061b189377
Nathan Binkert [Thu, 6 May 2004 23:01:16 +0000 (19:01 -0400)]
don't do dependencies on make generate
--HG--
extra : convert_revision :
0dac37a1676e795bf2ebf9572e37b6b78af7929a
Andrew Schultz [Thu, 6 May 2004 19:21:07 +0000 (15:21 -0400)]
Whole mess'o'changes.. see individual files
arch/alpha/vtophys.cc:
Removed buggy code that tries to fix PAL addresses (may cause problems
while trying to debug in PAL code, but that should do this fix outside
of vtophys)
base/loader/symtab.cc:
base/loader/symtab.hh:
cpu/exetrace.cc:
Changed InstExec traces to always print a symbol name
dev/ide_ctrl.cc:
dev/ide_disk.cc:
Tabs
dev/ide_disk.hh:
Change buffer size
dev/tsunami_pchip.cc:
Fix translatePciToDma to support scatter gather mapping
kern/linux/linux_system.cc:
Force simulator to wait until remote debugger attaches (should be removed
or turned on/off with a flag)
--HG--
extra : convert_revision :
1d08aebe3f448c87a963dd613de3e2e0cff0d48d
Nathan Binkert [Thu, 6 May 2004 16:10:16 +0000 (12:10 -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 :
12234085865daa71e32981177d3376c93b3ed11e
Nathan Binkert [Thu, 6 May 2004 16:09:54 +0000 (12:09 -0400)]
add support for sticking generated files in the build directory
instead of with the source code. This will hopefully be especially
useful when we're generating dozens of files when we flesh out the
object description stuff.
remove generated files from the source tree. python is required
to build now.
base/trace.hh:
no need for the underscore in the name
base/traceflags.py:
clean up code
--HG--
extra : convert_revision :
f68af8c3460eb7e73a1defaea3081a02ad7db33c
Erik Hallnor [Thu, 6 May 2004 00:57:07 +0000 (20:57 -0400)]
Documentation fixes
--HG--
extra : convert_revision :
9f62115463e6e624a95ae83189dac21c593a2ee4
Nathan Binkert [Wed, 5 May 2004 03:44:09 +0000 (23:44 -0400)]
file used by old compile time binning which lisa's since fixed
--HG--
extra : convert_revision :
b8ae8371fdf22b601bcfd15ce7c28af6ed081dc0
Nathan Binkert [Wed, 5 May 2004 03:42:15 +0000 (23:42 -0400)]
add a bit more data to the rob dump
--HG--
extra : convert_revision :
99f76a62d1a1f057868c4303905cc269fd56aab7
Nathan Binkert [Tue, 4 May 2004 21:01:00 +0000 (17:01 -0400)]
Major stats package cleanup
Add support for generic visitors for stats and use them
to implement independent output functions.
Support for mysql output and some initial code for hacking
on mysql output with python
arch/alpha/pseudo_inst.cc:
base/hybrid_pred.cc:
base/hybrid_pred.hh:
base/sat_counter.cc:
base/sat_counter.hh:
cpu/simple_cpu/simple_cpu.cc:
kern/tru64/tru64_events.cc:
sim/main.cc:
sim/process.cc:
sim/process.hh:
sim/sim_events.cc:
sim/sim_object.cc:
sim/system.hh:
update for changes in stats package
base/statistics.cc:
move the python output code to base/stats/puthon.(cc|hh)
and reimplement it as a visitor.
move the text output code to base/stats/text.(cc|hh) and
reimplement it as a visitor.
move the database stuff into base/stats/statdb.(cc|hh) and
get rid of the class. Put everything as globals in the
Statistics::Database namespace.
allocate unique ids for all stats.
directly implement the check routine and get rid of the
various dumping routines since they're now in separate files.
make sure that no two stats have the same name
clean up some loops
base/statistics.hh:
major changes to the statistics package again
lots of code was factored out of statistics.hh into several
separate files in base/stats/ (this will continue)
There are now two Stat package types Result and Counter that
are specified to allow the user to keep the counted type
separate from the result type. They are currently both doubles
but that's an experiment. There is no more per stat ability to
set the type. Statistics::Counter is not the same as Counter!
Implement a visitor for statistics output so that new output
types can be implemented independently from the stats package
itself.
Add a unique id to each stat so that it can be used to keep
track of stats more simply. This number can also be used in
debugging problems with stats.
Tweak the bucket size stuff a bit to make it work better.
fixed VectorDist size bug
cpu/memtest/memtest.cc:
Fix up for changes in stats package
Don't use value() since it doesn't work with binning. If you
want a number as a stat, and to use it in the program itself,
you really want two separate variables, one that's a stat,
and one that's not.
cpu/memtest/memtest.hh:
Fix up for changes in stats package
test/Makefile:
Try to build stuff now that directories matter
test/stattest.cc:
test all new output types
choose which one with command line options
--HG--
extra : convert_revision :
e3a3f5f0828c67c0e2de415d936ad240adaddc89
Erik Hallnor [Tue, 4 May 2004 20:32:43 +0000 (16:32 -0400)]
Update for doxygen 1.3.6
--HG--
extra : convert_revision :
e7a1820a5651dc68e2927194aeabd23a3d852487
Nathan Binkert [Tue, 4 May 2004 16:23:57 +0000 (12:23 -0400)]
Function for getting username
--HG--
extra : convert_revision :
50c0bf7b083e780071e85fabdcd6f91a96f4b2e3
Nathan Binkert [Tue, 4 May 2004 12:20:21 +0000 (08:20 -0400)]
don't duplicate stat names
--HG--
extra : convert_revision :
2a19b12457cb19e233e4b133044ff95eb5d44e2f
Andrew Schultz [Mon, 3 May 2004 15:48:17 +0000 (11:48 -0400)]
Merge zizzer:/bk/linux
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux
--HG--
extra : convert_revision :
8eca0fba9d96bffea7a24bce9b14f0284bd58c83
Andrew Schultz [Mon, 3 May 2004 15:47:52 +0000 (11:47 -0400)]
Checkin of latest IDE and some separation between platforms (Tsunami and
Turbolaser)
base/range.hh:
Change semantics of range to be inclusive of the end value, may need to
check other users of range to make sure they are semantically correct.
This was needed for access of last byte in range of address on IDE and
makes sense for case of range from 0 to all f
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
Whole mess of changes.. at current state simulator will boot and read
partition table and then have a bunch of errors and panic
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/platform.hh:
Changes to work with platform separation
dev/tsunami.cc:
dev/tsunami.hh:
Change to work with platform separation
--HG--
extra : convert_revision :
e1de22b54df7fdcf391efc2a8555ada93f46beab
Erik Hallnor [Thu, 29 Apr 2004 06:12:49 +0000 (02:12 -0400)]
Derive from SimObject so stats are registered.
--HG--
extra : convert_revision :
cbc70641235f040ebff6a98de7ff6384e06b8dbd
Erik Hallnor [Thu, 29 Apr 2004 04:52:43 +0000 (00:52 -0400)]
Change the way the DMAInterface works internally to make it easier to change things in the future.
--HG--
extra : convert_revision :
2f7275f95433918549e76b16a8903e5df2d0188c
Steve Reinhardt [Wed, 28 Apr 2004 23:28:37 +0000 (16:28 -0700)]
Minor enhancements to Python config stuff:
- Add support for assigning NULL to SimObject pointers. In Python,
this is a special value, distinct from None.
- Initial, incomplete pass at regenerating C++ parameter code (declarations
and INIT_PARAM macros) from .odesc files.
util/config/m5config.py:
- Add support for assigning NULL to SimObject pointers. In Python,
this is a special value, distinct from None.
- Initial, incomplete pass at regenerating C++ parameter code (declarations
and INIT_PARAM macros) from .odesc files.
--HG--
extra : convert_revision :
d7ae8f32e30b3c0829fd1a60589dd998e2e0d0d7
Erik Hallnor [Wed, 28 Apr 2004 20:14:29 +0000 (16:14 -0400)]
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision :
f658c6d2e86a736702fcb88b0493904a72f5e47f
Erik Hallnor [Wed, 28 Apr 2004 20:12:20 +0000 (16:12 -0400)]
Little updates do the documentation.
--HG--
extra : convert_revision :
647f2bc32064b1f330513d812d59357f01adc012
Erik Hallnor [Wed, 28 Apr 2004 00:16:00 +0000 (20:16 -0400)]
Add an adaptive compression scheme.
--HG--
extra : convert_revision :
4ebf32976ba983cb3b9175cdf5f2e1359fa49c8b
Nathan Binkert [Thu, 22 Apr 2004 22:10:35 +0000 (18:10 -0400)]
Cleanup configs since bridges are now autosensing of addresses
and are bidirectional.
--HG--
extra : convert_revision :
840c940b4cee991f3a0c8e365fb60c0ef9166cf2
Lisa Hsu [Wed, 21 Apr 2004 22:43:39 +0000 (18:43 -0400)]
just comment ns_gige.cc a little more
dev/ns_gige.cc:
add some comments
--HG--
extra : convert_revision :
96ae82f1f48b8e2e2ba8a6a0e2f37d8f992d15b3
Lisa Hsu [Wed, 21 Apr 2004 22:23:41 +0000 (18:23 -0400)]
This is where I'm at for Linux Ethernet before I head to Mexico.
base/range.hh:
andrew thought this might be a bug.
dev/etherpkt.cc:
don't need std:: since there is a using directive
dev/ns_gige.cc:
update to new PIO and PCI system
dev/ns_gige.hh:
update to deal with new PIO and PCI setup
dev/ns_gige_reg.h:
Add some new #defines that I ended up needing
dev/pcidev.cc:
some changes to the debugging printfs of pci device
--HG--
extra : convert_revision :
955ba8e8e1c418cfe1c6549dc3451ea091541556
Erik Hallnor [Fri, 16 Apr 2004 03:47:17 +0000 (23:47 -0400)]
Fix the way write delay are sent on the data bus so that they are always sent. Also fixes the problem of sending both responses and write delays.
--HG--
extra : convert_revision :
3bb684526bf2ed5ab7b05c54d768291baf5dec02
Erik Hallnor [Wed, 14 Apr 2004 22:44:38 +0000 (18:44 -0400)]
Code cleanup and debugging for the bus.
--HG--
extra : convert_revision :
8356dbf022e1aca71ff75f2947382af6a37d65b4
Erik Hallnor [Tue, 13 Apr 2004 03:54:21 +0000 (23:54 -0400)]
Each direction in the BusBridge can now buffer max requests before blocking
--HG--
extra : convert_revision :
c411cbf0affafebbc914d92d6691729fc3125486
Erik Hallnor [Tue, 13 Apr 2004 03:52:53 +0000 (23:52 -0400)]
Delete the new store data.
--HG--
extra : convert_revision :
1a03ab0500867e9855ff0cc343e29200c109cb1f
Erik Hallnor [Tue, 13 Apr 2004 02:07:33 +0000 (22:07 -0400)]
Add data to stores to make compression results consistant across version of the code.
--HG--
extra : convert_revision :
c72f46685e31cc93b1c1ddab78b8cf30473d4ac9
Erik Hallnor [Fri, 9 Apr 2004 04:36:53 +0000 (00:36 -0400)]
Connect the bus bridge up correctly, internally.
--HG--
extra : convert_revision :
323c0a79800721e4ecd253000095eb0a7a36bb29
Steve Reinhardt [Tue, 6 Apr 2004 17:02:00 +0000 (10:02 -0700)]
Beta version of Python configuration tool. Generates .ini files from
Python script description.
arch/alpha/alpha_memory.cc:
dev/io_device.cc:
Add DEFINE_SIM_OBJECT_CLASS_NAME for intermediate SimObjects.
test/paramtest.cc:
Fix stupid spelling.
--HG--
extra : convert_revision :
dc020208cb6507c1afb1ed771a7218daba678e09
Steve Reinhardt [Mon, 5 Apr 2004 18:01:01 +0000 (11:01 -0700)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
ca1c124e667fb6d2927959a2078dd2e28c26cd2b
Steve Reinhardt [Mon, 5 Apr 2004 18:00:48 +0000 (11:00 -0700)]
Changes to config to allow everything (including 'children'
and 'type') to be specified via instance name and not just
config class. Old code only did instance-name lookup for
SimObject parameters. This feature makes life easier for
transitioning to the Python script-based config.
sim/builder.cc:
Use ConfigNode::find to look for "type" parameter so it can
be found if set under instance name (not config class).
sim/param.cc:
Make Param<bool> accept "1" for true and "0" for false.
--HG--
extra : convert_revision :
f40d0878d0f03b2e216f0506c05d0e52db608cca
Erik Hallnor [Mon, 5 Apr 2004 05:09:46 +0000 (01:09 -0400)]
Make BusBridge bidirectional. Add a new slave and master interface to help accomplish this.
--HG--
extra : convert_revision :
41bf9ce95e2965e13f7325b0b0b3be198ca86aee
Steve Reinhardt [Sat, 3 Apr 2004 21:46:10 +0000 (13:46 -0800)]
More {Itb,Dtb} -> {ITB,DTB} renames (forgot to test build KERNEL).
Also missed renames in a bunch of config files somehow.
(See previous changeset for list of renames.)
arch/alpha/alpha_memory.cc:
arch/alpha/ev5.cc:
arch/alpha/faults.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.hh:
More {Itb,Dtb} -> {ITB,DTB} renames (forgot to test build KERNEL).
--HG--
extra : convert_revision :
b2c6ca0916b72b59895520fcacaf028667560a0d
Steve Reinhardt [Sat, 3 Apr 2004 07:19:08 +0000 (23:19 -0800)]
Merge
--HG--
extra : convert_revision :
dadfa2cd97908d769f1e2d5c645140f296ec6a82
Steve Reinhardt [Sat, 3 Apr 2004 06:57:08 +0000 (22:57 -0800)]
Basic cleanup pass to get rid of a few things that made the Python
configuration unnecessarily awkward. Biggest changes are:
- External and internal object names now match in all cases. The
macros still allow them to be different; the only reason I didn't
get rid of that is that the macros themselves should be going away
soon. In the few conflicting cases, I sometimes renamed the C++ object
and sometimes renamed the config object. The latter sets of substitions
are:
s/BaseBus/Bus/;
s/MemoryObject/FunctionalMemory/;
s/MemoryControl/MemoryController/;
s/FUPool/FuncUnitPool/;
- SamplingCPU is temporarily broken... we need to change the model
of how this works in the .ini file. Having it as a CPU proxy is
really awkward.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/simple_cpu/simple_cpu.cc:
sim/process.cc:
Rename objects to match config name.
cpu/base_cpu.cc:
Uncomment SimObject define since SamplingCPU no longer
does this for us.
dev/ethertap.cc:
Use unsigned instead of uint16_t for params.
kern/tru64/tru64_system.cc:
Use unsigned instead of uint64_t for init_param param.
test/paramtest.cc:
Fix old SimObjectParam.
--HG--
extra : convert_revision :
378ebbc6a71ad0694501d09979a44d111a59e8dc
Erik Hallnor [Fri, 2 Apr 2004 09:13:48 +0000 (04:13 -0500)]
Add new range functions to DmaInterface as well.
--HG--
extra : convert_revision :
3a7aa3e6495de86c365128b4bd1ef41fe8ff4142
Erik Hallnor [Fri, 2 Apr 2004 08:03:30 +0000 (03:03 -0500)]
Add automatic bus bridge address range setting/resetting. You can no longer directly set a address range on a bus bridge.
--HG--
extra : convert_revision :
708fb67b82c619f340f2b5a95f4542b573004774
Steve Reinhardt [Fri, 2 Apr 2004 06:18:00 +0000 (22:18 -0800)]
Fix dependencies (broken since Nate's tree-build change).
--HG--
extra : convert_revision :
7be203a46c53ac7cf464ac3857e27259a846dcfb
Erik Hallnor [Thu, 1 Apr 2004 23:23:17 +0000 (18:23 -0500)]
Add a average references to a cache block stat.
--HG--
extra : convert_revision :
ba0ff82985a44c8e2de129194b1f755199469f8f
Nathan Binkert [Fri, 26 Mar 2004 10:43:29 +0000 (05:43 -0500)]
Get rid of the printExtraOutput stuff
--HG--
extra : convert_revision :
d82718ad4b3c5dd56a99c727e78b39917f9d4541
Nathan Binkert [Thu, 25 Mar 2004 10:46:35 +0000 (05:46 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into crampon.:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
f210926c232d2999703bbb0adf08899d8c041729
Nathan Binkert [Thu, 25 Mar 2004 10:46:16 +0000 (05:46 -0500)]
Get rid of symlink hack in makefile
--HG--
extra : convert_revision :
c1bc90a1d823f8034da692afd6005456ef98831b
Steve Reinhardt [Thu, 25 Mar 2004 07:29:10 +0000 (23:29 -0800)]
Minor cleanup from building & diffing behavior
on various platforms.
base/hashmap.hh:
gcc on Alpha doesn't always define __LP64__,
even though it arguably should.
cpu/exec_context.cc:
Clear register file on non-full-system too (even though
it typically gets overwritten by the initial regs from
the Process object).
sim/process.cc:
Clear initial register copy in Process object.
Not all regs get initialized when the executable is loaded.
--HG--
extra : convert_revision :
f1fe4734a5ea81331d70994cb5284b1e9db0dceb
Nathan Binkert [Wed, 24 Mar 2004 15:25:18 +0000 (10:25 -0500)]
Don't indent namespaces because it just wastes space
--HG--
extra : convert_revision :
2236838a40bf77689a3d75df718c0da410c3fbb6
Nathan Binkert [Wed, 24 Mar 2004 15:00:29 +0000 (10:00 -0500)]
Get rid of the old VPATH stuff for getting at source files
instead, require a path for each file.
--HG--
extra : convert_revision :
9ecab85eefd10ee988edce06dd6c94e8df42ad95
Nathan Binkert [Wed, 24 Mar 2004 10:16:13 +0000 (05:16 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
b0af82ea6028d1f7f6756edf266945732c25ad52
Nathan Binkert [Wed, 24 Mar 2004 10:13:49 +0000 (05:13 -0500)]
Hacks to make the libelf stuff work in openbsd.
base/loader/elf_object.cc:
The symbol versioning stuff screws up OpenBSD. We don't need it anyway
--HG--
extra : convert_revision :
736d5c1baaf7f5727665f84cc08e3781e193b389
Erik Hallnor [Wed, 24 Mar 2004 09:41:27 +0000 (04:41 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
d950120ed0f96421bb953a96db94fb4aecf2241d
Erik Hallnor [Wed, 24 Mar 2004 09:41:19 +0000 (04:41 -0500)]
A few memory system performance enhancements.
base/compression/lzss_compression.cc:
base/compression/lzss_compression.hh:
Rework for better performance
--HG--
extra : convert_revision :
b13d706e0e23cbe7122b611258354c66cf5f3c70
Nathan Binkert [Wed, 24 Mar 2004 09:39:22 +0000 (04:39 -0500)]
memory.ini:
make the default width narrower
--HG--
extra : convert_revision :
eb25a979d065e9e3aaf030417a22c581209d8630
Nathan Binkert [Wed, 24 Mar 2004 09:35:48 +0000 (04:35 -0500)]
Minor changes to Time
base/time.cc:
base/time.hh:
Don't set the current time in the constructor. Use a flag and
make the default to not set the time.
Change reset() to set(). Dunno. Just seems right.
--HG--
extra : convert_revision :
5a3b09ed30376d4863b45b2bae551ba1c3aff8e1
Nathan Binkert [Wed, 24 Mar 2004 07:59:43 +0000 (02:59 -0500)]
ULL()
--HG--
extra : convert_revision :
543313ec248457e6cb2f8315881f030545e8cf45
Lisa Hsu [Tue, 23 Mar 2004 22:11:19 +0000 (17:11 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
--HG--
extra : convert_revision :
69440981a018ce8b7c1c8a73404da0a39faa3ac3
Andrew Schultz [Tue, 23 Mar 2004 22:10:07 +0000 (17:10 -0500)]
Add initial support for IDE
--HG--
extra : convert_revision :
e07dc6c87b0b692d428b541d4032fcf82996ef15
Lisa Hsu [Mon, 22 Mar 2004 22:11:36 +0000 (17:11 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
--HG--
extra : convert_revision :
7af5650ceae277ce838e778bba1fba86285d6dca
Andrew Schultz [Mon, 22 Mar 2004 21:59:43 +0000 (16:59 -0500)]
Automerge
--HG--
extra : convert_revision :
d79abea2623f31a27735640363dfbf655c226b62
Andrew Schultz [Mon, 22 Mar 2004 21:58:18 +0000 (16:58 -0500)]
Change member variable names to lower case
--HG--
extra : convert_revision :
390c30b8313e7acbd7d77b106716f7147d181111
Andrew Schultz [Mon, 22 Mar 2004 21:50:09 +0000 (16:50 -0500)]
Changed to inherit from DmaDevice to avoid multiple inheritance (now
assumes that all PCI devices are DmaDevices, and if not, they can just
ignore the DMA stuff)
--HG--
extra : convert_revision :
aa58b658370696674ca4c32b265bc0400e5dda5a
Erik Hallnor [Mon, 22 Mar 2004 18:59:51 +0000 (13:59 -0500)]
Fix to compile m5.fast
--HG--
extra : convert_revision :
b557975e2b03944abd5243ab9ea3e3ff6a915981
Lisa Hsu [Mon, 22 Mar 2004 18:21:18 +0000 (13:21 -0500)]
Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linux
--HG--
extra : convert_revision :
b4e2fc55ec9cd0caa7cdf02de8a61c66e8b35c67
Lisa Hsu [Mon, 22 Mar 2004 18:15:14 +0000 (13:15 -0500)]
forgot to check this in earlier - no confusion between types and member names!
dev/pcidev.cc:
member variables should begin with lowercase so they don't get confused with types.
dev/pcidev.hh:
member variables must begin with lowercase so they don't get confused with types.
--HG--
extra : convert_revision :
f083baa60d0fbf64d858d684ff70ee06e7b7765d
Erik Hallnor [Sun, 21 Mar 2004 06:20:19 +0000 (01:20 -0500)]
Update to store uncompressed data in the cache blocks at all times. This will allow us to simulate compression without paying the uncompress penalty on reads.
This also had the side-effect of getting copies and compression working together (collecting of code in helper function made this easier.)
--HG--
extra : convert_revision :
f81d3d7254b5a0c1cc82a7389c95a0b71ff67fc0
Ron Dreslinski [Fri, 19 Mar 2004 19:51:02 +0000 (14:51 -0500)]
Make it so that alpha_console can read the frequency from the correct
sim object(depends on which platform tsunami/tlaser is being used)
dev/alpha_console.cc:
Use dynamice casting once during build to get at the proper device to calculate the frequency.
It is either a tsunami_IO or a tlaser_clock depending on platform (tsunami/tlaser).
If the simobject is not of either of those types then panic
dev/alpha_console.hh:
Pass in a SimObject * that is to either a tlaser_clock or a tsunami_IO
sim/sim_object.cc:
Make it so that you can have a SimObjectParam of type SimObject:
example:
SimObjectParam<SimObject *> so;
--HG--
extra : convert_revision :
08239ef23762b8ea11311630b73fe885d939402e
Ali Saidi [Wed, 17 Mar 2004 21:12:13 +0000 (16:12 -0500)]
Updated kern/* code so we can have one console code and the simulator
changes the HWRPB to the correct system type/variation.
kern/linux/linux_system.cc:
kern/tru64/tru64_system.cc:
Added code to change system type/variation so that we can have one console
--HG--
extra : convert_revision :
5f35f7d965419cd3038e2e85e05a20884b2f6068
Erik Hallnor [Tue, 16 Mar 2004 02:24:50 +0000 (21:24 -0500)]
Pass cache block pointer when we have it.
--HG--
extra : convert_revision :
453690e0d7b53ecb7a9a3eb75a6365d13fd27573
Lisa Hsu [Fri, 12 Mar 2004 16:07:32 +0000 (11:07 -0500)]
merge etherpkt and makefile
--HG--
extra : convert_revision :
8f416468c7c239a4de6f8df2d632832921c1ced8
Lisa Hsu [Fri, 12 Mar 2004 16:04:58 +0000 (11:04 -0500)]
first pass at ns_ethernet device. more will come later as i merge in nate's new ether infrastructure.
dev/etherpkt.hh:
add some stuff for support of the NS ethernet device.
--HG--
extra : convert_revision :
51f6508463b6394055e3428a42b7de490a9ae6c1
Lisa Hsu [Fri, 12 Mar 2004 01:04:41 +0000 (20:04 -0500)]
merge from head of m5. note: i did not bother to merge the PIO stuff with scsi since we're not going that route anymore anyway. esp because it was giving me an error i couldn't seem to fix.
dev/alpha_console.cc:
missed this >>>> after i merged
kern/linux/linux_system.cc:
get rid of FS_MEASURES and change FnEvent to LinuxFnEvent
kern/linux/linux_system.hh:
get rid of FS_MEASURE
--HG--
extra : convert_revision :
210f46573bba0c772a224ce110af9a9230fabf6a
Lisa Hsu [Thu, 11 Mar 2004 23:52:29 +0000 (18:52 -0500)]
merge with m5 head
--HG--
extra : convert_revision :
c90339248d1ee74df1c6b90a77ec9ea41f646311
Lisa Hsu [Thu, 11 Mar 2004 23:47:29 +0000 (18:47 -0500)]
traceflags merge
--HG--
extra : convert_revision :
f8427ed6caa815500cbb0ce648f2495a2d039082
Lisa Hsu [Thu, 11 Mar 2004 17:45:27 +0000 (12:45 -0500)]
It was annoying me that there was PCIConfigAll and PciDev and PciConfigData. so for consistency I changed it.
dev/pciconfigall.cc:
dev/pciconfigall.hh:
dev/pcidev.cc:
dev/pcidev.hh:
dev/tsunami.hh:
change PCIConfigAll to PciConfigAll
--HG--
extra : convert_revision :
d2fa3f59b906c870fd9d46cfa94728c7587e3652
Erik Hallnor [Thu, 11 Mar 2004 05:54:54 +0000 (00:54 -0500)]
Use the specific tag type where we can.
--HG--
extra : convert_revision :
f6a8f9630a58486df026bea61fcfe46e223dc8e8
Erik Hallnor [Sun, 7 Mar 2004 06:26:16 +0000 (01:26 -0500)]
Performance improvement for unaligned copy
--HG--
extra : convert_revision :
36a67874c119c4ef5dbd6692292dae1a5dcfded0
Lisa Hsu [Sat, 6 Mar 2004 00:18:58 +0000 (19:18 -0500)]
change the naming of MainBins. didn't check this in before because i had random debug statements i didn't want to push along with it.
kern/tru64/tru64_system.cc:
change the naming of Bins, add some DPRINTFs
--HG--
extra : convert_revision :
65eeb61caa3132adc45972feff891e4a969c06c5
Lisa Hsu [Fri, 5 Mar 2004 20:15:23 +0000 (15:15 -0500)]
fix ALPHA
cpu/exec_context.cc:
put this code between #ifdef FULL_SYSTEM
--HG--
extra : convert_revision :
b934c7085d2a4337149ab8180a7d50851fbbf170
Lisa Hsu [Fri, 5 Mar 2004 13:16:33 +0000 (08:16 -0500)]
changes that affect post checkpoint runs.
cpu/exec_context.cc:
you can't delete an element of an array that you newed. oops.
kern/tru64/tru64_events.cc:
changes to reflect .ini changes, and also b/c es_intr and ipintr can happen at ANY point, even within a current calling path being tracked.
sim/system.cc:
can't delete an element of a newed array. must new them separately.
--HG--
extra : convert_revision :
21573327b7b7f20bf9a3fcfb5854526433e17e17
Lisa Hsu [Fri, 5 Mar 2004 11:15:30 +0000 (06:15 -0500)]
bin user and kernel stats
--HG--
extra : convert_revision :
66e6181ad3e8b6567da9f2b82d87e7af49f28eaf
Lisa Hsu [Fri, 5 Mar 2004 11:14:33 +0000 (06:14 -0500)]
nother fix
cpu/exec_context.cc:
nother little bug...forgot to pop off stack as i read off it
sim/system.cc:
forgot to pop off stack as i read off it
--HG--
extra : convert_revision :
d1f691c0a9f0fa22281c717ee465d8a5f1e45c13
Lisa Hsu [Fri, 5 Mar 2004 10:54:54 +0000 (05:54 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
--HG--
extra : convert_revision :
e4303df381e5f397d15c37eb05377be1860f89be
Lisa Hsu [Fri, 5 Mar 2004 10:54:46 +0000 (05:54 -0500)]
forgot to check this in
--HG--
extra : convert_revision :
3090da3ab1077736bae52519143b44b08dd5ddb9
Nathan Binkert [Fri, 5 Mar 2004 10:50:33 +0000 (05:50 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
51b3fd809a77e146b8370636b2cc60ddf1075195
Nathan Binkert [Fri, 5 Mar 2004 10:50:19 +0000 (05:50 -0500)]
Don't dump an ethertrace by default
Update the system dir for the addition of parallel and dirty netperf
--HG--
extra : convert_revision :
e46efb32e0d6c21047507d444d41e7d55fbfb770
Nathan Binkert [Fri, 5 Mar 2004 10:49:49 +0000 (05:49 -0500)]
Make payload splitting accessible with a #define
--HG--
extra : convert_revision :
90b86b270a84cffaf3d13a2b83c04f33bb442e44
Nathan Binkert [Fri, 5 Mar 2004 10:48:56 +0000 (05:48 -0500)]
add a mechanism for delayed interrupts (aka. interrupt coalescing)
re-do fixed dma latency
--HG--
extra : convert_revision :
b91e6b69682f66e424782e89500d3ad47b797e25
Nathan Binkert [Fri, 5 Mar 2004 10:47:05 +0000 (05:47 -0500)]
Add support for a propagation delay on the link. The electrical
delay is more or less folded into the packet time, but an additional
delay is possible representing crossing a long haul link, or some
switches, etc.
--HG--
extra : convert_revision :
8fd689c2a7e3051e77f47a4cd5f51c6999d92c8f
Nathan Binkert [Fri, 5 Mar 2004 10:45:45 +0000 (05:45 -0500)]
constructor option to make the wrapped event autodelete
--HG--
extra : convert_revision :
8663c874c533685adf21eea968b08b40b7d7b665
Nathan Binkert [Fri, 5 Mar 2004 10:44:46 +0000 (05:44 -0500)]
use %#x so we know that it is hex
--HG--
extra : convert_revision :
7da77cd9a16ba70eeb0382c3c79b1475554a2d4c
Nathan Binkert [Fri, 5 Mar 2004 10:44:11 +0000 (05:44 -0500)]
add ticks per picosecond
--HG--
extra : convert_revision :
1585e7f89340b941e699db6b81080af58500a7c2
Lisa Hsu [Fri, 5 Mar 2004 10:38:04 +0000 (05:38 -0500)]
small bugfix, forgot to increment iter
sim/system.cc:
oops, forgot to increment iter.
--HG--
extra : convert_revision :
95fcd337d00157ccf072f0eb301b76f280480839
Lisa Hsu [Fri, 5 Mar 2004 10:09:05 +0000 (05:09 -0500)]
serialization for binning. it is WAAAAAAAY past my bedtime.
cpu/exec_context.cc:
sim/system.cc:
sim/system.hh:
serialization for binning
--HG--
extra : convert_revision :
f8417794a3a5ec7f2addc9c2da0f48e851899112
Lisa Hsu [Fri, 5 Mar 2004 02:57:17 +0000 (21:57 -0500)]
Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/work/bk/bincleanup
--HG--
extra : convert_revision :
7b5dc465231a861f0b460e3cbf9ee2ad2b2f5246
Lisa Hsu [Fri, 5 Mar 2004 02:57:09 +0000 (21:57 -0500)]
Overall gist of this is to 'dynamicize' the tracking of functions so you can choose them at the .ini stage rather than at compile time.
to do it:
in .ini file set binned_fns=foo null bar foo
what this says is, track foo when it is called by null (i.e. anything). bin bar only when it is called by foo.
essentially, if you have a path of functions to track, the 0th, 2nd, 4th fn listed are the fns to track, and the 1st, 3rd, 5th are their respective callers.
base/statistics.hh:
turn it back to FS_MEASURE since we already have a build in place
kern/tru64/tru64_events.cc:
remove FS_MEASURE #defs. add more DPRINTF's. manage an anomaly that happens when tracking idle_thread.
kern/tru64/tru64_events.hh:
remove FS_MEASURE #defs
kern/tru64/tru64_system.cc:
make DumpState print all the time, but only with DPRINTF. add a new parameter to tru64System a vector<string> binned_fns, to read in from .ini file. now all this binning stuff is dynamically generated.
kern/tru64/tru64_system.hh:
remove all static binning stuff, add support for dynamic
sim/system.cc:
change nonPath bin name to Kernel, remove FS_MEASURE
sim/system.hh:
change nonPath to Kernel
--HG--
extra : convert_revision :
9ee813c0a64273bab4125815b7bc8145c5897ec1
Erik Hallnor [Fri, 5 Mar 2004 01:03:38 +0000 (20:03 -0500)]
Reenable functioning copies.
arch/alpha/isa_desc:
Reenable copies.
--HG--
extra : convert_revision :
99259c0ff65e742e617cba1c14f5d1bf4be2fee8