Nathan Binkert [Fri, 30 Sep 2005 17:34:43 +0000 (13:34 -0400)]
Clean up some formatting
kern/linux/linux_system.cc:
remove random character
kern/linux/linux_threadinfo.hh:
Formatting fixes
--HG--
extra : convert_revision :
2be4772d7455ea1f4eb22966e00831701b7cbc27
Steve Reinhardt [Fri, 30 Sep 2005 01:50:52 +0000 (21:50 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/poolfs/z/home/stever/bkr/m5
--HG--
extra : convert_revision :
c00173bbf537efd352ab7ce824bd23dc0177bb60
Steve Reinhardt [Fri, 30 Sep 2005 01:50:37 +0000 (21:50 -0400)]
Fixes for building ALPHA_FS_TL with g++ 4.0.
--HG--
extra : convert_revision :
6f74cf888de8725696efdfb039f5621486ad4968
Ali Saidi [Thu, 29 Sep 2005 21:09:53 +0000 (17:09 -0400)]
fix for delayed state machine changes
--HG--
extra : convert_revision :
db19e3687f48799725a9062e014588d318988cee
Steve Reinhardt [Thu, 29 Sep 2005 20:03:36 +0000 (16:03 -0400)]
Fix for qdo & new pool node build.
util/qdo:
unset PROMPT_COMMAND in shell in case system sets
it for us.
--HG--
extra : convert_revision :
f9f20f7dc6b9585b60f3ce53aadd06e7d64f5179
Steve Reinhardt [Sun, 25 Sep 2005 20:48:24 +0000 (16:48 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/poolfs/z/home/stever/bk/m5
--HG--
extra : convert_revision :
c777f18ba8462b7286ec8588b859de8f4091a772
Steve Reinhardt [Sun, 25 Sep 2005 01:24:44 +0000 (21:24 -0400)]
Create build_options/current dir when necessary.
build/SConstruct:
Need to create build_options/current the first time through.
--HG--
extra : convert_revision :
13bf8c69a4a30671283a8b789ed21875b2301f24
Steve Reinhardt [Sun, 25 Sep 2005 01:16:02 +0000 (21:16 -0400)]
Split build options files into a static set of defaults
for committing to bk and a dynamically updated set which
are not under revision control.
build/SConstruct:
Split build options into static defaults and dynamic "current" settings.
--HG--
rename : build/build_options/ALPHA_FS => build/build_options/default/ALPHA_FS
rename : build/build_options/ALPHA_FS_TL => build/build_options/default/ALPHA_FS_TL
rename : build/build_options/ALPHA_SE => build/build_options/default/ALPHA_SE
extra : convert_revision :
8219211a3f2ce955fd6e2c34c169cac3fc704854
Steve Reinhardt [Sat, 24 Sep 2005 22:17:51 +0000 (18:17 -0400)]
Clean up indentation in isa_desc.
arch/alpha/isa_desc:
Little bit of re-ordering and indentation clean-up.
--HG--
extra : convert_revision :
e538ff89d8b507c3e1aa68a032578fcaa645d7ee
Steve Reinhardt [Sat, 24 Sep 2005 19:22:28 +0000 (15:22 -0400)]
Fix IDE disk UDMA mode support mask to actually reflect support for
modes 4 *and below*, not just mode 4.
dev/ide_disk.cc:
Fix UDMA mode support mask to actually reflect support for
modes 4 *and below*, not just mode 4.
--HG--
extra : convert_revision :
3506d503a5e8ce8a8686fb3a552383d365be0d41
Steve Reinhardt [Sat, 24 Sep 2005 18:20:29 +0000 (14:20 -0400)]
Add functions to System object to set up function-based events,
including automatically fixing up addresses to deal with
optionally executed Alpha gp update prolog.
SConscript:
Remove freebsd_events.cc and linux_events.cc.
base/remote_gdb.cc:
cpu/pc_event.cc:
kern/system_events.cc:
kern/system_events.hh:
PCEvents now schedule themselves in constructor.
cpu/pc_event.hh:
PCEvents now schedule themselves in the constructor.
Get rid of constructor versions that don't take an address and
all the schedule() methods that are now unnecessary.
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
Use new System methods to schedule function-based events.
Move FreeBSD-specific function event classes into FreebsdSystem.
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
Use new System methods to schedule function-based events.
Move Linux-specific function event classes into LinuxSystem.
kern/tru64/tru64_events.hh:
PCEvents now schedule themselves in constructor.
Add DebugPrintfrEvent to encapsulate raw setting as new type
(to work better with new System function-event method.)
kern/tru64/tru64_system.cc:
Use new System methods to schedule function-based events.
kern/tru64/tru64_system.hh:
Add DebugPrintfrEvent to encapsulate raw setting as new type
(to work better with new System function-event method.)
sim/system.cc:
sim/system.hh:
Add functions to set up function-based events, including
automatically fixing up addresses to deal with optionally
executed Alpha gp update prolog.
--HG--
extra : convert_revision :
c2cf09144297b6602afe755a34a0a2227023783f
Steve Reinhardt [Thu, 22 Sep 2005 19:27:42 +0000 (15:27 -0400)]
Support for compiling and testing on pool via 'qdo' script.
For this to work qdo must be on your path. I've copied it into
/usr/local/bin on zizzer.
build/SConstruct:
Add BATCH and BATCH_CMD options to support compiling/testing
on pool via qdo.
--HG--
extra : convert_revision :
b7fc46465e897f7f15ed4a67f6735886917a6c4b
Nathan Binkert [Mon, 19 Sep 2005 01:22:57 +0000 (21:22 -0400)]
Tweak the set of coalesced interrupts
dev/ns_gige.cc:
clean up usage of ISR_FOO macros
dev/ns_gige_reg.h:
Clean up #defines
make ISR_RXIDLE and ISR_TXIDLE coalesced
--HG--
extra : convert_revision :
fd64fc6a441d096fc45737fdcb837de8868ca10a
Nathan Binkert [Mon, 19 Sep 2005 01:20:24 +0000 (21:20 -0400)]
fix the MAX_CHECKPOINTS stuff
sim/serialize.cc:
Make the max checkpoint thing actually stop after the last
checkpoint
--HG--
extra : convert_revision :
091179c4706e9876a9b7e826513c5c14ce6b72af
Nathan Binkert [Sat, 17 Sep 2005 20:51:26 +0000 (16:51 -0400)]
Totally re-work the way that jobfiles are done so there is more
information that can be used for other aspects of sending jobs.
New graphing output stuff with matplotlib.
util/pbs/job.py:
Shuffle code around and create the JobDir class which encapsulates
all of the functionality needed for making, organizing, and cleaning
a job directory.
Better status output
util/pbs/jobfile.py:
Majory re-working of the jobfile code.
A job file now consists of several objects that describe how
jobs should be run, it includes information about checkpoints,
and graphing.
util/pbs/send.py:
use the new jobfile code.
deal with the 15 character limit of pbs by truncating the name and
using the raj hack.
util/stats/db.py:
fix the __str__ function for nodes
provide __getitem__ for the Database class
util/stats/stats.py:
use the jobfile stuff to figure out what the proper naming
and organziation of the graphs should be.
move all output code to output.py, get rid of ploticus and use
matplotlib
--HG--
rename : util/categories.py => util/stats/categories.py
extra : convert_revision :
0d793cbf6ad9492290e8ec875ce001c84095e1f7
Nathan Binkert [Sat, 17 Sep 2005 14:47:16 +0000 (10:47 -0400)]
Fix the EtherDump parameters
dev/etherdump.cc:
no default parameters anymore they should be in python
python/m5/objects/Ethernet.py:
move the maxlen parameter for EtherDump into python
--HG--
extra : convert_revision :
a796353a68907dfeb22059cd3ad536e6e8f60998
Nathan Binkert [Sat, 17 Sep 2005 14:43:05 +0000 (10:43 -0400)]
Simple option cleanup in the config files.
--HG--
extra : convert_revision :
50b9a1bf79705badabc6e0a6b4402e79997866e6
Nathan Binkert [Sat, 17 Sep 2005 02:54:01 +0000 (22:54 -0400)]
various changes to the boot scripts
configs/boot/iscsi-client.rcS:
configs/boot/nfs-client-dbench.rcS:
don't use the /proc/m5 stuff, use the m5 binary
configs/boot/nfs-client-nhfsstone.rcS:
set up checkpoints
change nhfsstone configuration
configs/boot/nfs-client.rcS:
use more memory
configs/boot/nfs-server.rcS:
change the writeback frequency
load a larger simulated disk image.
create more nfsd threads
--HG--
extra : convert_revision :
242dfd261d62782c06847d64b9f6aa06664a1ec9
Ali Saidi [Tue, 13 Sep 2005 02:53:57 +0000 (22:53 -0400)]
only set an approriately sized piece of data. so break where appropriate
Again... how did this work?
--HG--
extra : convert_revision :
06dcab4ac9f5760c9847d0fa47fea67c4a46544a
Ali Saidi [Mon, 12 Sep 2005 20:09:58 +0000 (16:09 -0400)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
792c2993791fdce6170c7b875fc6510c74faae65
Ali Saidi [Mon, 12 Sep 2005 20:09:51 +0000 (16:09 -0400)]
format string did not match variable size -> stack corruption
--HG--
extra : convert_revision :
b7c5aaa9d1f1242cfe337d6555e476f622a2aa6d
Steve Reinhardt [Mon, 12 Sep 2005 12:59:20 +0000 (08:59 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
2d1c571b1507eb34b22f983d76ca48a7ca61c3b9
Steve Reinhardt [Mon, 12 Sep 2005 12:59:14 +0000 (08:59 -0400)]
More minor tweaks for fenv/cygwin.
build/SConstruct:
No need to warn about regression failures w/o fenv.h anymore.
--HG--
extra : convert_revision :
f40efb849f4c3063ebb58f6e277473467916573d
Ali Saidi [Mon, 12 Sep 2005 07:01:57 +0000 (03:01 -0400)]
Merge zizzer:/bk/m5
into zeep.eecs.umich.edu:/z/saidi/work/m5
--HG--
extra : convert_revision :
3eff9b41fbf30ae0365adf05a71625c92ce1a4c0
Ali Saidi [Mon, 12 Sep 2005 07:01:43 +0000 (03:01 -0400)]
fixes for gcc 4.0
base/mysql.hh:
include mysql_version to get rid of that annoying mysql error.
make sure refcount is set in all constructors
base/pollevent.hh:
dev/ethertap.hh:
dev/pciconfigall.hh:
dev/tsunami_cchip.hh:
dev/tsunami_io.hh:
dev/tsunami_pchip.hh:
sim/param.cc:
fix for gcc 4
--HG--
extra : convert_revision :
be626af2f40ca402818996ef27249ae256c63ef1
Steve Reinhardt [Sun, 11 Sep 2005 23:29:41 +0000 (19:29 -0400)]
Explicitly handle rounding on FP-to-integer conversions.
Seems to avoid the significant problems on platforms w/o fenv.h.
arch/alpha/isa_desc:
Explicitly handle rounding on FP-to-integer conversions.
Seems to avoid the significant problems on platforms w/o fenv.h.
Get rid of FP "Fast" vs "General" distinction... more headache than
it's worth.
arch/isa_parser.py:
Fix bug with "%s" in C++ templates (must escape properly to
pass through Python string interpolation).
--HG--
extra : convert_revision :
de964d764e67e0934ac0ef535f53c974640731fb
Steve Reinhardt [Mon, 5 Sep 2005 20:31:27 +0000 (16:31 -0400)]
Regression tests now run under scons!
For example, 'scons ALPHA_SE/test/opt/quick' will build
ALPHA_SE/m5.opt if necessary and run all the self-identified
"quick" tests on it. Other possibilities:
- Run just test1: scons ALPHA_SE/test/opt/test1
- Run all tests: scons ALPHA_SE/test/opt
- Run all tests on debug build: scons ALPHA_SE/test/debug
- Update test1 reference outputs in m5-test:
scons update_ref=y ALPHA_SE/test/opt/test1
The proper tests will be selected based on the setting
of FULL_SYSTEM, ALPHA_TLASER, etc.
README:
Update directions to use scons-based test invocation.
SConscript:
Return list of generated build environments to SConstruct
so it can associate tests with each of them.
Set 'M5Binary' attribute on each env to record name of
generated binary to be tested.
build/SConstruct:
- Support invoking m5-test tests via scons.
- Add new non-sticky option category, for 'update_ref'.
- Move existing "sticky" option definitions out of
build_dir loop. Someday we can generate help text
from these.
- Make 'CC' and 'CXX' sticky options; use environment vars as
defaults if available.
- Make config builder more scons-y.
python/m5/__init__.py:
Make AddToPath() correctly handle relative path arguments.
Assumes that sys.path[0] has the directory where the current
Python file lives; new m5execfile() function sets this up
properly for exec'd files.
--HG--
extra : convert_revision :
48896688592e210d8e63f96c34e57474853d0e66
Steve Reinhardt [Sat, 3 Sep 2005 01:30:02 +0000 (21:30 -0400)]
Fixes to build with gcc 4.0.
sim/param.hh:
Add "template<>" to explicit template specialization.
--HG--
extra : convert_revision :
05e2f4ad8141a8782fe09a0b6824baf56c9fc957
Steve Reinhardt [Fri, 2 Sep 2005 21:23:03 +0000 (17:23 -0400)]
Force Unix EOL even on Windows (i.e. Cygwin).
--HG--
extra : convert_revision :
0aa171dc79c4d06d45e28d2907c7eb6d6fde433e
Steve Reinhardt [Fri, 2 Sep 2005 21:21:02 +0000 (17:21 -0400)]
Get rid of non-essential default-valued options.
This lets SConstruct set things like USE_MYSQL
based on the host w/o complaining.
build/build_options/ALPHA_FS_TL:
build/build_options/ALPHA_FS:
build/build_options/ALPHA_SE:
Get rid of non-essential default-valued options.
--HG--
extra : convert_revision :
96308897d2b9269dbefffa6d50ac491379444030
Steve Reinhardt [Fri, 2 Sep 2005 18:38:11 +0000 (14:38 -0400)]
Bug fix: can't increment an iterator after you erase
the thing it points to. Somehow Linux doesn't care,
but Cygwin sure does.
--HG--
extra : convert_revision :
1209a75831f080f17a95433e546d7074f9f07332
Steve Reinhardt [Thu, 1 Sep 2005 15:35:03 +0000 (11:35 -0400)]
Fix to #define True/False option values as 0/1 in header.
--HG--
extra : convert_revision :
7fbae4816a4d0a5ed942e0ad8afed9464dd1ba11
Steve Reinhardt [Thu, 1 Sep 2005 15:32:58 +0000 (11:32 -0400)]
Convert type of max_time and progress_interval parameters
from Latency to Tick, and rename max_time to max_tick.
python/m5/objects/Root.py:
sim/root.cc:
Convert type of max_time and progress_interval
from Latency to Tick, and rename max_time to max_tick.
--HG--
extra : convert_revision :
2f2aacf6321c3003a0ce834acd8fb726abf27ce3
Nathan Binkert [Wed, 31 Aug 2005 14:00:42 +0000 (10:00 -0400)]
more scons fixes for mysql
build/SConstruct:
Only the major and minor mysql version numbers are guaranteed
to be integers (e.g. 4.1.10a), and since that's all we care about
only try to deal with those.
for older versions of mysql, the strings returned by mysql_config may
have quotes in them, remove those so things work
--HG--
extra : convert_revision :
de32f3e76618f0caf4d5578edd61beaeef666eb6
Steve Reinhardt [Wed, 31 Aug 2005 04:19:37 +0000 (00:19 -0400)]
Move options files from <build_dir>/build_options to build_options/<build_dir>.
build/SConstruct:
Move options file from <build_dir>/build_options to build_options/<build_dir>.
--HG--
extra : convert_revision :
0363f79ef5c9c157d9018fcae9c5e055e38e552d
Steve Reinhardt [Wed, 31 Aug 2005 03:53:35 +0000 (23:53 -0400)]
Add script to generate new build directories.
--HG--
extra : convert_revision :
2d2455ced5b33476bf88483c81ddf447a0658be2
Steve Reinhardt [Wed, 31 Aug 2005 03:34:36 +0000 (23:34 -0400)]
Fix to work with older versions of mysql_config that don't support --include.
Also add mysql version check.
--HG--
extra : convert_revision :
36b6174ed1c64e8c5516f6adee71f27e068ceca2
Steve Reinhardt [Tue, 30 Aug 2005 17:18:54 +0000 (13:18 -0400)]
Build options are set via a build_options file in the
build directory instead of being inferred from the name
of the build directory.
Options are passed to C++ via config/*.hh files instead of
via the command line. Build option flags are now always
defined to 0 or 1, so checks must use '#if' rather than
'#ifdef'.
SConscript:
MySQL detection moved to SConstruct.
Add config/*.hh files (via ConfigFile builder).
arch/alpha/alpha_memory.cc:
arch/alpha/ev5.cc:
arch/alpha/ev5.hh:
arch/alpha/isa_traits.hh:
base/fast_alloc.hh:
base/statistics.cc:
base/statistics.hh:
base/stats/events.cc:
base/stats/events.hh:
cpu/base.cc:
cpu/base.hh:
cpu/base_dyn_inst.cc:
cpu/base_dyn_inst.hh:
cpu/exec_context.cc:
cpu/exec_context.hh:
cpu/o3/alpha_cpu.hh:
cpu/o3/alpha_cpu_builder.cc:
cpu/o3/alpha_cpu_impl.hh:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_dyn_inst_impl.hh:
cpu/o3/alpha_params.hh:
cpu/o3/commit_impl.hh:
cpu/o3/cpu.cc:
cpu/o3/cpu.hh:
cpu/o3/fetch_impl.hh:
cpu/o3/iew.hh:
cpu/o3/iew_impl.hh:
cpu/o3/regfile.hh:
cpu/o3/rename_impl.hh:
cpu/o3/rob_impl.hh:
cpu/ozone/cpu.hh:
cpu/pc_event.cc:
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
sim/process.cc:
sim/process.hh:
Convert compile flags from def/undef to 0/1.
Set via #include config/*.hh instead of command line.
arch/alpha/isa_desc:
Convert compile flags from def/undef to 0/1.
Set via #include config/*.hh instead of command line.
Revamp fenv.h support... most of the ugliness is hidden
in base/fenv.hh now.
base/mysql.hh:
Fix typo in #ifndef guard.
build/SConstruct:
Build options are set via a build_options file in the
build directory instead of being inferred from the name
of the build directory.
Options are passed to C++ via config/*.hh files instead of
via the command line.
python/SConscript:
Generate m5_build_env directly from scons options
instead of indirectly via CPPDEFINES.
python/m5/convert.py:
Allow '0' and '1' for booleans.
Rewrite toBool to use dict.
base/fenv.hh:
Revamp <fenv.h> support to make it a compile option
(so we can test w/o it even if it's present) and to
make isa_desc cleaner.
--HG--
extra : convert_revision :
8f97dc11185bef5e1865b3269c7341df8525c9ad
Steve Reinhardt [Fri, 26 Aug 2005 12:18:23 +0000 (08:18 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
dc9d0dc344389063f7b2026bd7cf737bdab3ee8b
Steve Reinhardt [Fri, 26 Aug 2005 12:18:12 +0000 (08:18 -0400)]
Add explicit check for Python version to SConstruct.
build/SConstruct:
Add explicit check for Python version.
--HG--
extra : convert_revision :
19ee788f72d63eb301e4be4c0c5729a5025c379f
Nathan Binkert [Tue, 23 Aug 2005 15:47:55 +0000 (11:47 -0400)]
better debugging of the configuration builder.
--HG--
extra : convert_revision :
9c51937e8bcc1ff93e24bd507d662fd50b5de6a0
Nathan Binkert [Tue, 23 Aug 2005 15:47:12 +0000 (11:47 -0400)]
Clean up the passing of the boot command line to the kernel.
kern/linux/linux_system.cc:
Don't hard code the address of the command line in the kernel,
instead, deduce it from the location of known symbols.
don't use strcpy, it's dangerous.
kern/linux/linux_system.hh:
Don't hard code the address of the command line in the kernel,
instead, deduce it from the location of known symbols.
--HG--
extra : convert_revision :
128b1d5dbd00b0b8571707da99f86f76e29abfd1
Nathan Binkert [Tue, 23 Aug 2005 15:45:52 +0000 (11:45 -0400)]
Lots of fixes to serialization and naming of various device
objects. The improper serialization of arrays was particularly
bad.
dev/alpha_console.cc:
dev/isa_fake.cc:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/tsunami_cchip.cc:
dev/tsunami_io.cc:
dev/tsunami_pchip.cc:
the pio interface is a different simobject and should have a
different name.
dev/ethertap.cc:
fix serialization.
dev/ide_ctrl.cc:
- the pio interface is a different simobject and should have a
different name.
- properly initialize variables
- When serializing an array, the size is the number of elements,
not the number of bytes!
dev/pcidev.cc:
When serializing an array, the size is the number of elements,
not the number of bytes!
dev/tsunami_io.hh:
Don't make objects SimObjects if they're not exposed to python.
Don't add serialization functions to events, it's generally not
what you want.
allow the real time clock and interval timer to serialize themselves,
must pass a base name since it is not a SimObject and the values will
be going into the section of the parent.
--HG--
extra : convert_revision :
3fc5de9b858ed770c8f385cf38b53242cf859c33
Nathan Binkert [Tue, 23 Aug 2005 15:38:27 +0000 (11:38 -0400)]
don't use sprintf. It's not guaranteed to not scribble over memory.
base/remote_gdb.cc:
use snprintf, it's safer
dev/ide_disk.cc:
use strncpy instead of snprintf
--HG--
extra : convert_revision :
90455e3f6bcb4c771724298a5a0b79a5b483a85c
Steve Reinhardt [Fri, 19 Aug 2005 21:10:17 +0000 (17:10 -0400)]
A few minor fixes to get things to build on Cygwin.
README:
Clarify cygwin EIO error explanation.
build/SConstruct:
Cygwin header files cause uninitialized var warnings.
dev/ide_ctrl.cc:
Get rid of unnecessary byte-swap calls, some of which were
too ambiguous for cygwin (or gcc 3.4.4).
dev/pcidev.cc:
Disambiguate arg for overloaded byte swap operation
(and fix it to be the correct one).
--HG--
extra : convert_revision :
be37c6315aacbec6332b1d09e726b39b4aa18dce
Steve Reinhardt [Fri, 19 Aug 2005 04:10:45 +0000 (00:10 -0400)]
Minor tweaks for 1.1 release.
README:
Updated for release 1.1. Clarified several minor things (I hope).
--HG--
extra : convert_revision :
a088f670739d33765611ce413b96854a1b51bb0f
Nathan Binkert [Thu, 18 Aug 2005 18:19:11 +0000 (14:19 -0400)]
Fix another bug from the freebsd merge
--HG--
extra : convert_revision :
b153b0c12b6678df148839617954a9a4c6fec7d4
Nathan Binkert [Thu, 18 Aug 2005 17:29:40 +0000 (13:29 -0400)]
Fix a couple of turbolaser problems that were introduced by the
new freebsd code.
dev/ns_gige.cc:
g++ doesn't like it when you declare a variable inside a case
label. Pull the declaration outside.
--HG--
extra : convert_revision :
d39e84fc58f2dd5b09c5948eedb4b1d7848e9817
Benjamin Nash [Tue, 16 Aug 2005 20:08:42 +0000 (16:08 -0400)]
Clean up freebsd_system.cc.
kern/freebsd/freebsd_system.cc:
Use htog instead of htoa.
--HG--
extra : convert_revision :
09224d60ce5bb3827c9f046127ff6fc72fa008d6
Benjamin Nash [Tue, 16 Aug 2005 19:45:30 +0000 (15:45 -0400)]
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
9b7ca872187a13179118ad0651301d531332dc63
Miguel Serrano [Tue, 16 Aug 2005 19:44:57 +0000 (15:44 -0400)]
Uart fix.
dev/uart8250.cc:
Fixed implementation of "transmit interrupt clear".
--HG--
extra : convert_revision :
cb69d61413ea799d5d3825fe2f0891dd72995561
Benjamin Nash [Tue, 16 Aug 2005 19:27:39 +0000 (15:27 -0400)]
Merge m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
36bb126381caf84d85a566579225b02c15f8f356
Nathan Binkert [Tue, 16 Aug 2005 15:27:49 +0000 (11:27 -0400)]
Updates to job scripts to accept more than 15 characters of jobname
Make the Link directory even more useful by working with
sub-directories.
util/pbs/job.py:
Expose JOBNAME as a separate parameter from PBS_JOBNAME. If the
former exists, it is used as the jobname for starting the job, if
it doesn't exist, PBS_JOBNAME is used. This is to get around the 15
character maximum pbs job name length. While we're at it, shuffle
things around to hopefully make things a bit more clear.
util/pbs/send.py:
Make the Link directory functionality more sophisticated, copy
sub-directories and links to directories. (we still don't copy
dotfiles though)
Add the setname() function to contact pbs and use raj's hack to
tell the webpage about longer jobnames. (it's gross, don't look)
truncate the pbs job name to 15 characters so that it works.
--HG--
extra : convert_revision :
4a76b1a1c33721c7ca93e2fbb761f95bc3a2ac69
Benjamin Nash [Mon, 15 Aug 2005 21:17:17 +0000 (17:17 -0400)]
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
dev/ns_gige.cc:
dev/pciconfigall.cc:
dev/pcidev.cc:
dev/rtcreg.h:
dev/tsunami_io.cc:
dev/tsunami_io.hh:
dev/uart8250.cc:
dev/uart8250.hh:
python/m5/objects/Tsunami.py:
Merge code.
--HG--
extra : convert_revision :
e97d5dbcc051d2061622201265430d359f995d48
Miguel Serrano [Mon, 15 Aug 2005 20:59:58 +0000 (16:59 -0400)]
Changes for getting FreeBSD to run.
SConscript:
Added more files to compile: dev/pcifake.cc, dev/isa_fake.cc, kern/freebsd/freebsd_system.cc, kern/freebsd/freebsd_events.cc.
arch/alpha/isa_traits.hh:
Added constant for argument register 2 as it is needed by FreebsdSystem::doCalibrateClocks().
cpu/exec_context.hh:
cpu/o3/alpha_cpu.hh:
Replaced htoa()s with gtoh() and htog().
cpu/o3/fetch_impl.hh:
cpu/simple/cpu.cc:
Replaced htoa() with gtoh().
dev/disk_image.cc:
Replaced htoa()s with letoh()s.
dev/ide_ctrl.cc:
Got rid of magic numbers.
Added IdeChannel and IdeRegType type names where necessary.
dev/ide_ctrl.hh:
Got rid of unnecessary macros.
Changed RegType_t to IdeRegType.
Changed bmi_regs to allow accessing registers by name instead of just by array index.
Added IdeChannel enum type to use in place of bool variables which were used to specify IDE channel.
dev/ide_disk.cc:
Rewrote IdeDisk::read and IdeDisk::write functions to specify registers by name instead of indexing through an array.
dev/ide_disk.hh:
Updated command register struct.
dev/ns_gige.cc:
dev/ns_gige.hh:
Made ReadConfig and WriteConfig begin with a lower-case letter.
writeConfig() now takes a pointer to data as a parameter instead of a copy of data.
dev/pciconfigall.cc:
writeConfig() now takes a pointer to data as a parameter instead of a copy of data.
dev/pcidev.cc:
Cleaned up readConfig() and writeConfig() functions.
dev/pcidev.hh:
Added macros to make code that works with the BARs (base adress registers) more readable. writeConfig() now takes a pointer to data.
dev/pcireg.h:
Changed PCIConfig struct to make accessing elements more straight forward. Removed type 1 (for PCI-to-PCI bridges) PCI configuration space struct since it is not used.
dev/rtcreg.h:
Added macros for bit fields in RTC status registers A & B.
dev/sinic.cc:
Function name change: WriteConfig --> writeConfig.
writeConfig() now takes a pointer to data instead of a copy of data.
The accessing of elements of PCIConfig structure is updated.
dev/sinic.hh:
Function name change: WriteConfig --> writeConfig.
writeConfig() now takes a pointer to data instead of a copy of data.
dev/tsunami_io.cc:
Added implementation of new RTC and PIT classes.
dev/tsunami_io.hh:
Added classes for RTC and PIT modules.
dev/tsunamireg.h:
Added macros for DMA ports used by Tsunami-Tru64.
dev/uart8250.cc:
Got rid of a magic number.
Transmit (Tx) interrupts should clear upon a read of the Interrupt ID register.
dev/uart8250.hh:
Added comments and macros dealing with the UART Interrupt ID register.
kern/linux/linux_system.cc:
Replaced htoa() with htog().
python/m5/objects/Pci.py:
PciFake is a python class for Pci Devices that do nothing.
python/m5/objects/Tsunami.py:
TsunamiFake was renamed as IsaFake.
sim/system.cc:
Replaced htoa()s with htog()s.
dev/isa_fake.cc:
New BitKeeper file ``dev/isa_fake.cc''
TsunamiFake was renamed as IsaFake.
dev/isa_fake.hh:
New BitKeeper file ``dev/isa_fake.hh''
TsunmaiFake was renamed as IsaFake.
dev/pitreg.h:
New BitKeeper file ``dev/pitreg.h''
Useful macros for working with PIT (Periodic Interval Timer) registers.
--HG--
extra : convert_revision :
33f3a8a1034af4f6c71b32dd743e371c8613e780
Nathan Binkert [Mon, 15 Aug 2005 20:12:19 +0000 (16:12 -0400)]
Fix NextEthernetAddr
python/m5/config.py:
NextEthernetAddr shouldnt' be a Singleton since we want __init__ to be
called more than once.
Make the EthernetAddr class a "proxy" so that unproxy will
be called and NextEthernetAddr will generally work correctly.
--HG--
extra : convert_revision :
c89bf268e805e202ae71030fcea4833867c7e477
Benjamin Nash [Fri, 12 Aug 2005 22:30:35 +0000 (18:30 -0400)]
Improve FreeBSD networking support.
dev/ns_gige.cc:
Added FreeBSD support. Required additional register read/write functionality, hash filtering (faked), and EEPROM read access.
dev/ns_gige.hh:
Added constants and variables for FreeBSD support. Also created eepromKick() to advance state machine.
dev/ns_gige_reg.h:
Defined additional register bit fields.
dev/pcidev.cc:
Fix &= typo.
dev/sinic.cc:
Remove an INIT_PARAM_DFLT macro.
dev/tsunami_io.cc:
Fix DPRINTF typo.
kern/freebsd/freebsd_system.cc:
Edit comments.
--HG--
extra : convert_revision :
37aaa1303d57d3784381e85acb3bc1743adeb8c0
Benjamin Nash [Thu, 28 Jul 2005 17:16:45 +0000 (13:16 -0400)]
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
SConscript:
dev/ide_disk.hh:
Formatting.
dev/ide_ctrl.cc:
Endianness
dev/ide_disk.cc:
dev/pcidev.cc:
dev/tsunami_io.cc:
dev/uart8250.cc:
Clean up code.
--HG--
extra : convert_revision :
cb554f0e3a701371d2106cd7e11a4a22f773acc2
Miguel Serrano [Thu, 28 Jul 2005 15:49:01 +0000 (11:49 -0400)]
.
SConscript:
add pcifake
dev/ide_ctrl.cc:
dev/ide_ctrl.hh:
dev/ide_disk.cc:
dev/ide_disk.hh:
endianess
dev/tsunami_io.cc:
rtc, date/time
--HG--
extra : convert_revision :
21ad27c780749cb6f6eef2b57798c0c292c3f14d
Miguel Serrano [Thu, 28 Jul 2005 15:47:06 +0000 (11:47 -0400)]
ghgfsdf
dev/pciconfigall.cc:
removed union.
dev/pcidev.cc:
.
dev/rtcreg.h:
more macros to avoid magic numbers.
dev/tsunami_io.cc:
replaced magic numbers, no more advancing RTC as it isn't reaaly necessary.
dev/tsunami_io.hh:
removed declarations of things that go unused.
dev/uart8250.cc:
reading the Interrupt ID register should clear TX interrupt flag.
dev/uart8250.hh:
useful #defines.
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
nothing.
python/m5/objects/Pci.py:
new PciFake.
--HG--
extra : convert_revision :
88259704f5b215591d1416360180810fcda14d26
Benjamin Nash [Tue, 26 Jul 2005 16:48:26 +0000 (12:48 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
5cfec85dbfc33b942929e6d379275618f2c60c33
Benjamin Nash [Tue, 26 Jul 2005 16:28:33 +0000 (12:28 -0400)]
Various changes to I/O, addition of PciFake device to improve FreeBSD compatibility.
SConscript:
Include pcifake.cc, fix spacing.
dev/ide_ctrl.cc:
Consolidate switch-case blocks.
dev/ide_disk.cc:
Add comments.
dev/pciconfigall.cc:
Adjust spacing.
dev/pcidev.cc:
Adjust spacing, rearrange code.
dev/tsunami_io.cc:
Rearrange code.
dev/uart8250.cc:
Switch uart interrupt interval back to original value.
python/m5/objects/Pci.py:
Add PciFake class to be used as a PCI-ISA bridge device.
--HG--
extra : convert_revision :
8aea94318510079a310377f297aa161ba5f7864c
Steve Reinhardt [Mon, 18 Jul 2005 23:58:43 +0000 (19:58 -0400)]
Fix for passing functional memory param to timing mem.
python/m5/config.py:
Fix error message.
--HG--
extra : convert_revision :
4e57f7bdd4ea7dfdd3e88c60080f993997b0bda2
Steve Reinhardt [Thu, 14 Jul 2005 11:53:26 +0000 (07:53 -0400)]
Fix for bug in using compression in full-system mode.
Involves adding functional memory param
(for full-system mode only, for now).
--HG--
extra : convert_revision :
f42cf087969427b5406be0162e13163d3624684f
Benjamin Nash [Wed, 13 Jul 2005 16:30:13 +0000 (12:30 -0400)]
Various changes to m5/dev files to work with FreeBSD.
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/pcidev.cc:
Made endian-independent.
dev/ide_disk.hh:
fixed.
dev/pciconfigall.cc:
The data to write is contained in a 32-bit unsigned int now. The union method would not have worked on big-endian machines.
dev/pcidev.hh:
Fixed typo.
dev/tsunami_io.cc:
Return zero on RTC alarm reads.
dev/uart8250.cc:
Fix uart interrupt handling.
--HG--
extra : convert_revision :
b5c08e8e77644c399c20888666406805ff1b6649
Nathan Binkert [Thu, 7 Jul 2005 02:22:01 +0000 (22:22 -0400)]
no license in tree
--HG--
extra : convert_revision :
4a9bb7be1e7e3f465ad34b9129b7c1e0578dbfcc
Steve Reinhardt [Wed, 6 Jul 2005 01:08:13 +0000 (21:08 -0400)]
config:
Add license.
--HG--
extra : convert_revision :
af110213e79464b8f2d970a2e906d1234e818c6d
Benjamin Nash [Fri, 1 Jul 2005 19:57:14 +0000 (15:57 -0400)]
Hand merge ide_disk.cc
dev/ide_disk.cc:
Don't initialize data to 0.
--HG--
extra : convert_revision :
643bcf15b52c3e14231d8136b8cb049a8896457a
Miguel Serrano [Fri, 1 Jul 2005 19:12:09 +0000 (15:12 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
--HG--
extra : convert_revision :
bb3e977e79599c459fb32f309ce5b486f1639afa
Miguel Serrano [Fri, 1 Jul 2005 19:10:18 +0000 (15:10 -0400)]
Benjamin Nash [Fri, 1 Jul 2005 19:07:13 +0000 (15:07 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
b421397b21326ec2bdd3ce82b9f69e224b380610
Benjamin Nash [Fri, 1 Jul 2005 17:06:35 +0000 (13:06 -0400)]
Fix formatting, move default size (0x8) of TsunamiFake from C++ code to Python code.
dev/ide_disk.cc:
Fix formatting. Panic if unexpected register type is given.
python/m5/objects/Tsunami.py:
Add default size of TsunamiFake device.
--HG--
extra : convert_revision :
03a35a2f6468b95746cba41ce7e93afeeb70ccef
Steve Reinhardt [Fri, 1 Jul 2005 01:59:08 +0000 (21:59 -0400)]
Initialize bpred table pointers.
--HG--
extra : convert_revision :
9999c05b7fb8f66c2b9d5544868994f82d432d19
Benjamin Nash [Thu, 30 Jun 2005 20:18:07 +0000 (16:18 -0400)]
Remove #include statments in various files within kern/
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
kern/kernel_stats.cc:
kern/kernel_stats.hh:
kern/linux/aligned.hh:
kern/linux/linux_system.cc:
kern/linux/linux_system.hh:
kern/linux/linux_threadinfo.hh:
kern/linux/printk.cc:
kern/linux/sched.hh:
kern/linux/thread_info.hh:
kern/system_events.cc:
kern/system_events.hh:
Remove unecessary #include statements.
--HG--
extra : convert_revision :
7e32d3b096fc92708ea45db9b172bada906024cd
Benjamin Nash [Thu, 30 Jun 2005 17:12:12 +0000 (13:12 -0400)]
Formatting, reduce maximum number of functional memory children.
dev/ide_disk.cc:
dev/pcidev.cc:
Formatting.
--HG--
extra : convert_revision :
6f5824aa220fe311751fb10ec8648fe64dfa4775
Steve Reinhardt [Thu, 30 Jun 2005 04:42:27 +0000 (00:42 -0400)]
Fixes for cygwin compile.
dev/ide_atareg.h:
Need endian.h for LITTLE_ENDIAN.
sim/syscall_emul.hh:
Need to include sys/fcntl.h to get O_BINARY.
--HG--
extra : convert_revision :
606f9506dc483f3952dcc65b8ba25c28001f2c43
Nathan Binkert [Thu, 30 Jun 2005 02:20:38 +0000 (22:20 -0400)]
Easier remote debugging at boot time.
sim/system.cc:
Add a global variable that will tell the remote debugger to
wait when a given CPU is is registered.
--HG--
extra : convert_revision :
a093c9331daa675d4b59a321e53a5da6ea292c40
Nathan Binkert [Thu, 30 Jun 2005 02:16:40 +0000 (22:16 -0400)]
Fix uninitialized variables in ide controller
dev/ide_ctrl.cc:
Initialize variables to zero to avoid uninitialized usage.
--HG--
extra : convert_revision :
98fd0bfc2b7530938c6ab3a55345d0e594098238
Benjamin Nash [Wed, 29 Jun 2005 22:44:50 +0000 (18:44 -0400)]
Formatting.
--HG--
extra : convert_revision :
c26a04563d571aae2b509eadf9f3eb5f61f3b2f7
Benjamin Nash [Wed, 29 Jun 2005 22:11:33 +0000 (18:11 -0400)]
Formatting and decrerease maximum number of children in functional memory.
SConscript:
Adjust formatting.
--HG--
extra : convert_revision :
3665c763f389084136ea88ffbd765a00c49c52c5
Benjamin Nash [Wed, 29 Jun 2005 15:17:12 +0000 (11:17 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
a27bb3737d8a7d5c1fadf27f4cb5018d0b6054da
Nathan Binkert [Wed, 29 Jun 2005 05:20:41 +0000 (01:20 -0400)]
Allow CPUs to specify their own CPU ids.
Make the AlphaConsole calculate the number of CPUs instead
of passing that in as a parameter.
cpu/base.cc:
pass the desired cpu_id into registerExecContext, offsetting it
by the thread number. a cpu_id of -1 means that it should be
generated for you.
cpu/base.hh:
Take the cpu_id as a parameter
cpu/o3/alpha_cpu_builder.cc:
cpu/simple/cpu.cc:
Accept the cpu_id as a parameter
while we're here, let's remove the multiplier since it is
not used.
dev/alpha_console.cc:
don't take the number of CPUs as a parameter. Calculate it from
the system based on the number of CPUs that have been registered.
move init() code to startup() to ensure that all CPUs are registerd.
dev/alpha_console.hh:
python/m5/objects/AlphaConsole.py:
don't take the number of CPUs as a parameter.
move init() code to startup() to ensure that all CPUs are registerd.
python/m5/objects/BaseCPU.py:
take the cpu_id as a parameter. Default it to -1 which means
that it will be generated.
sim/system.cc:
allow the registerExecContext functioin to take a desired
cpu_id as a parameter. Check to ensure that the id isn't
already used. Accept -1 as a request to have an id assigned.
sim/system.hh:
keep track of the number of registered exec contexts.
provide a function for accessing the number of exec contexts
that checks to ensure that they are all registered correctly.
--HG--
extra : convert_revision :
8e12f96ff8a49fa16cdbbdb4c05c651376c35788
Benjamin Nash [Tue, 28 Jun 2005 18:03:04 +0000 (14:03 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
453615c8194ae9ca96330b7493c6b19fc89c3a72
Nathan Binkert [Tue, 28 Jun 2005 16:42:15 +0000 (12:42 -0400)]
Don't hard code the location of m5AlphaAccess. Instead, move the
code into a function that can be called by the AlphaConsole class.
AlphaConsole will pass in its address.
arch/alpha/ev5.hh:
Move Phys2K0Seg to ev5.hh and fixup the TSUNAMI uncacheable
bits so that they will be converted correctly.
dev/alpha_access.h:
Do not hard code the location of the AlphaConsole
dev/alpha_console.cc:
fixup #includes
tell the system where the alpha console is
sim/system.hh:
Provide a function that will tell the system where the AlphaAccess
structure (device) lives
--HG--
extra : convert_revision :
92d70ca926151a32eebe9925de597459ac58013e
Nathan Binkert [Tue, 28 Jun 2005 05:09:13 +0000 (01:09 -0400)]
Pass the location of the m5 console backdoor to the console
instead of compiling it into the console version
dev/alpha_access.h:
move serialization stuff to alpha_console.hh
define the ALPHA_ACCESS_BASE in m5 instead of in console.c and
have m5 pass the value to the console
dev/alpha_console.cc:
dev/alpha_console.hh:
Move serialization stuff into a derived class of AlphaAccess
sim/system.cc:
pass the value of ALPHA_ACCESS_BASE to the console code via
the m5AlphaAccess console variable.
--HG--
extra : convert_revision :
0ea4ba239f03d6dad51a6efae0385aa543064117
Nathan Binkert [Mon, 27 Jun 2005 23:30:19 +0000 (19:30 -0400)]
Reorganize tap code so that more than one method can be used
for accessing physical packets.
Add support for tap devices found on linux and bsd.
--HG--
extra : convert_revision :
198b082f2e847da8471c3f22d6a55beb9f4b592e
Benjamin Nash [Mon, 27 Jun 2005 22:08:42 +0000 (18:08 -0400)]
Change IDE disk and ethernet device to work better with FreeBSD.
dev/ide_ctrl.cc:
dev/ide_disk.cc:
dev/ide_disk.hh:
Add support for 32-bit accesses.
dev/ns_gige.cc:
Change default configuration register value to work with FreeBSD driver.
--HG--
extra : convert_revision :
c9dd125338a97ffa8cd95293e6b7877068652387
Nathan Binkert [Mon, 27 Jun 2005 21:04:43 +0000 (17:04 -0400)]
Update for console code reorganization
dev/alpha_access.h:
Update the ALPHA_ACCESS_VERSION
move typedefs to this file since they're only used here.
dev/alpha_console.cc:
formatting
sim/system.cc:
xxm -> m5
--HG--
extra : convert_revision :
3aeca50d1385034f5a1e20dd8b0abd03bd6f26f0
Nathan Binkert [Mon, 27 Jun 2005 21:02:40 +0000 (17:02 -0400)]
Implement a state machine clock that acutally limits how fast
the nsgige state machine can run. The frequency is of the actual
state transitions, and not the rate of what underlying
instructions might run at.
dev/ns_gige.cc:
Implement a state machine clock that acutally limits how fast
the state machine can run. After each state transition, a
variable is kept to hold the next state transition until the
next clock. The frequency is of the actual state transitions,
and not the rate of what underlying instructions might run at.
dev/ns_gige.hh:
Add back the rxKickEvent and txKickEvent events.
python/m5/objects/Ethernet.py:
Default the state machine clock to '0ns' so the default
behaviour doesn't change when we actually implement the
state machine clock.
--HG--
extra : convert_revision :
2db1943dee4e91ea75aaee6a91e88f27f01a09dd
Nathan Binkert [Mon, 27 Jun 2005 21:01:24 +0000 (17:01 -0400)]
rename m5scons.py scons_helper.py
--HG--
extra : convert_revision :
faaacc493b8da5d002d498e10cfa8cf004aafeed
Benjamin Nash [Thu, 23 Jun 2005 20:27:17 +0000 (16:27 -0400)]
Merge m5read@m5.eecs.umich.edu:/bk/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
--HG--
extra : convert_revision :
a0a8fea7224913ef106dc733182abd938feab64d
Benjamin Nash [Thu, 23 Jun 2005 20:27:06 +0000 (16:27 -0400)]
Changed timer functionality, ide disk interrupts, and TsunamiFake class to improve FreeBSD compatibility.
dev/ide_disk.cc:
Make ide disk set interrupts correctly.
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Implement read of timer counts.
kern/freebsd/freebsd_system.cc:
kern/freebsd/freebsd_system.hh:
Remove SkipFuncEvents that we don't need to skip.
python/m5/objects/Tsunami.py:
Add size parameter to TsunamiFake class.
--HG--
extra : convert_revision :
a87e74f2cac0036060ca8cb3fde4760d8c91a5db
Ali Saidi [Thu, 23 Jun 2005 08:07:04 +0000 (01:07 -0700)]
Added Float class
Fixed printing so the tokenizer in m5 doesn't get confused
Expanded NullSimObject so it could be used as an element in a VectorParam
--HG--
extra : convert_revision :
661b1916967d663ab7aee891f15f7ca190deeba6
Nathan Binkert [Wed, 22 Jun 2005 13:59:13 +0000 (09:59 -0400)]
Move max_time and progress_interval parameters to the Root
object and get rid of the ParamContext that each used to have.
python/m5/objects/Root.py:
Add max_time and progress_interval to the Root object
sim/root.cc:
Add max_time and progress_interval to the Root object. These
parameters used to be in their own contexts in sim_events.cc
sim/sim_events.cc:
Get rid of the ParamContext for max cycles and the progress
event. Move the functionality to the Root object
sim/sim_events.hh:
Move ProgressEvent declaration to the header so that it can
be used in other files.
--HG--
extra : convert_revision :
ff664b806855e8eb9201b8a25392aa53204464f0
Nathan Binkert [Wed, 22 Jun 2005 13:52:14 +0000 (09:52 -0400)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/head
--HG--
extra : convert_revision :
9dc37bbcc1dd5669f6de4e35a7c37e54d0af5c05
Nathan Binkert [Wed, 22 Jun 2005 13:52:02 +0000 (09:52 -0400)]
fix tokenize
base/str.cc:
Fix tokenize so that it doesn't behave incorrectly when there
are empty strings.
test/tokentest.cc:
Clean up the test function so it's easier to see what's going on
--HG--
extra : convert_revision :
c7a3db7bc516d3575b1cc4ab7afbd0f1fbe1ec6f
Steve Reinhardt [Wed, 22 Jun 2005 11:26:02 +0000 (07:26 -0400)]
Fix: opt_cpu and trace_cpu were already defined in syscall_emulation
when I added them to the global list...
SConscript:
Remove opt_cpu and trace_cpu from syscall_emulation_sources
to avoid double definition.
--HG--
extra : convert_revision :
b10a2e648249b1d742b881aa7580f8d1b0d6fbc1
Steve Reinhardt [Tue, 21 Jun 2005 19:42:10 +0000 (15:42 -0400)]
Fix cache bug... getting a response on a writeback hit
(from a trace replay).
SConscript:
Compile in trace-reader CPUs.
--HG--
extra : convert_revision :
35b0da704e94b07a75fd89131028fbfbf31cf3a6
Steve Reinhardt [Tue, 21 Jun 2005 17:49:37 +0000 (13:49 -0400)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/m5
--HG--
extra : convert_revision :
32a82fce7c12b2a72bc3196a667e96d66b8b0b37
Nathan Binkert [Mon, 20 Jun 2005 02:13:31 +0000 (22:13 -0400)]
little bit of formatting
clean up debugging a bit
dev/ns_gige.cc:
little bit of formatting
don't break in the debugger if a packet is dropped when the
receiver is disabled since it can realistically happen
--HG--
extra : convert_revision :
364efa3eb16990db191085f5b847c3bb255a173c