Andrew Schultz [Tue, 3 Feb 2004 21:35:26 +0000 (16:35 -0500)]
Automerged
--HG--
extra : convert_revision :
7925eb08f4ebc3e846a1a304eeeb832b48862fca
Ali Saidi [Tue, 3 Feb 2004 21:28:48 +0000 (16:28 -0500)]
Merge zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/kernel
into zizzer.eecs.umich.edu:/y/saidi/work/m5
--HG--
extra : convert_revision :
2a71828fc732961ab2fcee1afee0f6daa092e4c9
Ali Saidi [Tue, 3 Feb 2004 21:23:51 +0000 (16:23 -0500)]
Aded tsunami_pcidev and associated updates
--HG--
extra : convert_revision :
f29f421c966e36aa372d0faef6257c1aea205a03
Nathan Binkert [Tue, 3 Feb 2004 16:24:03 +0000 (11:24 -0500)]
merge
--HG--
extra : convert_revision :
47425264e672f727cbb13aa7b9bb2a67790b25e8
Nathan Binkert [Tue, 3 Feb 2004 15:51:10 +0000 (10:51 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
9b8a94cbaacbbb4a53d15c0893ee4d3183f29ce0
Nathan Binkert [Tue, 3 Feb 2004 15:50:04 +0000 (10:50 -0500)]
Remote debugging cleanup and internal debugging support
base/kgdb.h:
Remove flags that aren't used
base/remote_gdb.cc:
Better debugging:
- Give each class a name() function so that the trace infrastructure
knows the correct object name.
- Make the remote debugger capable of detach.
- Split out the RGDB trace flag into a bunch of specific flags.
Remove dead code
Add a new trap type
base/remote_gdb.hh:
Add a name() to the various objects for the trace system
base/trace.hh:
don't need a using directive
add DPRINTFNR: debug printf, no flag, raw output
kern/tru64/tru64_system.cc:
use the INT trap type instead of IF
--HG--
extra : convert_revision :
25e610216c6f43d5d328651bba915f71bade059e
Steve Reinhardt [Tue, 3 Feb 2004 15:19:05 +0000 (07:19 -0800)]
Fix bug: forgot branchTarget() method on indirect branches.
arch/alpha/isa_desc:
Add missing branchTarget() method for indirect branches.
cpu/static_inst.hh:
Add comment clarifying when branchTarget() can be used
on indirect branches.
--HG--
extra : convert_revision :
0dcfb36a9792a338cefceb3d1501825abace7ac5
Steve Reinhardt [Tue, 3 Feb 2004 03:09:47 +0000 (19:09 -0800)]
Fix handling of uncacheable loads. Make them wait until they're at the tail of
the ROB (so we know they're correct-path) before we mark them ready to issue.
--HG--
extra : convert_revision :
be1d431bdc939100d79a5fea3e415b3acf9e8d75
Steve Reinhardt [Tue, 3 Feb 2004 02:58:23 +0000 (18:58 -0800)]
Get rid of LVQ-port function unit... only used for redundant
multithreading, which has been gone for a long time.
--HG--
extra : convert_revision :
717d13455483c3adc7b7cbbcc5f7493d51867974
Steve Reinhardt [Tue, 3 Feb 2004 02:53:27 +0000 (18:53 -0800)]
Clean up some confusing ROBStation fields left over from SS (ea_comp, in_LSQ).
Eliminate indirect decoder.cc dependence on rob_station.hh via full_cpu.hh.
--HG--
extra : convert_revision :
9355cddd6cd8bbe100aae1b2d45d2752e76ba3f6
Steve Reinhardt [Tue, 3 Feb 2004 02:14:11 +0000 (18:14 -0800)]
insn->inst
--HG--
extra : convert_revision :
fcc556fb7e65855ec3c04ef272177c8e7a38fff9
Steve Reinhardt [Mon, 2 Feb 2004 23:55:35 +0000 (15:55 -0800)]
Change "Foo& foo" declarations to "Foo &foo".
This primarily to be internally consistent (sometimes we used one,
sometimes the other, even within the same line of code!).
I picked the latter to be symmetric with "Foo *foo".
base/cprintf_formats.hh:
base/range.hh:
base/refcnt.hh:
base/res_list.hh:
base/statistics.hh:
base/str.hh:
cpu/exec_context.hh:
cpu/simple_cpu/simple_cpu.cc:
cpu/simple_cpu/simple_cpu.hh:
sim/serialize.cc:
sim/serialize.hh:
sim/syscall_emul.hh:
Change "Foo& foo" declarations to "Foo &foo".
--HG--
extra : convert_revision :
ca1b0e85a578b539214bda3b8d61ac23792f2e87
Steve Reinhardt [Mon, 2 Feb 2004 23:45:22 +0000 (15:45 -0800)]
More conversions of ref-counted parameters to references:
Statistics::NodePtr, StaticInstPtr, ethernet PacketPtr.
base/statistics.hh:
Change NodePtr parameters to Nodeptr &.
cpu/exetrace.hh:
Change StaticInstPtr parameters to StaticInstPtr &.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ethertap.hh:
change PacketPtr parameters to PacketPtr &.
--HG--
extra : convert_revision :
a778efdca33b0ec5beb76cf47db0e9e4728897ee
Steve Reinhardt [Mon, 2 Feb 2004 18:47:21 +0000 (10:47 -0800)]
Change MemReqPtr parameters to references.
This avoids incrementing and decrementing the MemReq
reference counters on every call and return.
arch/alpha/alpha_memory.cc:
arch/alpha/alpha_memory.hh:
cpu/exec_context.hh:
cpu/memtest/memtest.cc:
cpu/memtest/memtest.hh:
dev/alpha_console.cc:
dev/alpha_console.hh:
Change MemReqPtr parameters to references.
--HG--
extra : convert_revision :
3ba18bdd9f996563988402576bfdd3430e1ab1e5
Steve Reinhardt [Mon, 2 Feb 2004 15:19:45 +0000 (07:19 -0800)]
Make stats:dump_period work even if dump_cycle isn't set.
--HG--
extra : convert_revision :
9e85c0fa0f6c5393dd8e91034a49975628cf825d
Andrew Schultz [Sat, 31 Jan 2004 10:38:16 +0000 (05:38 -0500)]
Change configs to use SimpleController instead of ScsiController
--HG--
extra : convert_revision :
f8288b13cc0d4ad8ef5cab458012cb5a5cb242c4
Andrew Schultz [Sat, 31 Jan 2004 10:36:14 +0000 (05:36 -0500)]
Split the SCSI controller into a base class (ScsiController) and
two seperate implementations (SimpleController for Tru64 and
AdaptecController for Linux)
--HG--
extra : convert_revision :
5458a42d34e6001b3ea11b87511b1f9ee853b4f7
Ali Saidi [Sat, 31 Jan 2004 06:25:13 +0000 (01:25 -0500)]
added tsunami_pcidev
--HG--
extra : convert_revision :
14ad0f7afd930c29ff45f6edd51db8d8f8a07be0
Nathan Binkert [Fri, 30 Jan 2004 23:12:48 +0000 (18:12 -0500)]
Update for changes in the console
This is basically the same thing that was done for tlaser_uart
--HG--
extra : convert_revision :
e0de84b83d1ee4fe0ef769b4de232dbbd7d9c228
Nathan Binkert [Fri, 30 Jan 2004 23:10:15 +0000 (18:10 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/kernel
--HG--
extra : convert_revision :
9bb172c13912f69c53897ae215e077c9b8194dd9
Andrew Schultz [Fri, 30 Jan 2004 22:38:25 +0000 (17:38 -0500)]
Fixed the spec2000.ini file and made some cosmetic changes to the
setup-spec script
util/setup-spec:
Made some changes so the information contained in the ini file explains
what the init_param value corresponds to
--HG--
extra : convert_revision :
4082209f920244c262150c224a92ea21a55febd5
Andrew Schultz [Fri, 30 Jan 2004 22:20:03 +0000 (17:20 -0500)]
Added the spec2000 ini file
--HG--
extra : convert_revision :
981a5a536a25b07dd54ed0166b291876b0a498c0
Nathan Binkert [Fri, 30 Jan 2004 21:01:26 +0000 (16:01 -0500)]
Merge
--HG--
extra : convert_revision :
8690e31b64235874d74ea4a1123a408610fb115b
Nathan Binkert [Fri, 30 Jan 2004 20:59:06 +0000 (15:59 -0500)]
Merge Sampler
--HG--
extra : convert_revision :
d10232f4602790f3b325e2e10e3098caaeaa53b3
Ali Saidi [Fri, 30 Jan 2004 20:24:50 +0000 (15:24 -0500)]
Linux boots with no devices
dev/tsunami.hh:
Started commenting code
dev/tsunami_cchip.cc:
removed unneccessary config files
dev/tsunami_io.cc:
Added code to see the value written
dev/tsunami_uart.cc:
conviently one of the addresses the SuperI/O southbridge can be is the same space
as the UART. This stops the simulator from panicing although it should probably be
changed a bit.
--HG--
extra : convert_revision :
a3334a2c418ee8228089d0e1791fa78bbb276fe5
Steve Raasch [Fri, 30 Jan 2004 18:51:09 +0000 (13:51 -0500)]
major rework/rewrite of the breakdown script
--HG--
extra : convert_revision :
2e1d186e0f20b6089300b82a3f6dcb1d0b44c09d
Steve Reinhardt [Fri, 30 Jan 2004 17:16:34 +0000 (09:16 -0800)]
Use $(MAKE) instead of 'make' when building libelf (suppresses an error message about -j).
Check for, delete, and die on zero-length .d files.
--HG--
extra : convert_revision :
71b7f9e639d96fb7ed30952b142d69c34c725774
Steve Reinhardt [Fri, 30 Jan 2004 16:18:20 +0000 (08:18 -0800)]
Fix libelf generation so it works on a clean make -j.
--HG--
extra : convert_revision :
377633aa2c04695c598ee82a9529d2e40f0ffef7
Nathan Binkert [Fri, 30 Jan 2004 03:30:14 +0000 (22:30 -0500)]
wrap debugging stuff with #ifdef DEBUG
--HG--
extra : convert_revision :
8205633c1c1b49b04f389aa40f95fbbc03a43fb6
Nathan Binkert [Thu, 29 Jan 2004 22:44:08 +0000 (17:44 -0500)]
delete the data in the arglist when the list is destroyed,
not while printing out the data. This allows the data
to be dumped more than once.
base/cprintf.hh:
need a destructor
--HG--
extra : convert_revision :
235e9fe24488ac4c0ae1b562ef9fa6e0bd1e899c
Nathan Binkert [Thu, 29 Jan 2004 21:33:03 +0000 (16:33 -0500)]
whack debugging statement
--HG--
extra : convert_revision :
f623d35a6e5a234e2b203974012c653b91826dbf
Nathan Binkert [Thu, 29 Jan 2004 21:32:03 +0000 (16:32 -0500)]
Fix character input by handling the character and the
special console values separately.
dev/alpha_console.cc:
use new console specific input function
--HG--
extra : convert_revision :
08997d6115d2aac3a26cac2774b3c3fc0cd76ab0
Nathan Binkert [Thu, 29 Jan 2004 15:32:01 +0000 (10:32 -0500)]
remove #include of nonexistent file
sim/universe.cc:
oops. this doesn't exist
--HG--
extra : convert_revision :
2cfb3680e4ebe3f27f22a79f853d4d6df445e65a
Nathan Binkert [Thu, 29 Jan 2004 05:38:18 +0000 (00:38 -0500)]
provide an output stream for simulator output. (This takes place of the
statStream catchall that we had before)
Also provide an optional output directory that multiple simulator output
files can be written to.
Make most output files use the output directory
base/misc.cc:
send warnings to the outputStream as well
base/trace.cc:
dprintf_stream defaults to cerr
dev/console.cc:
use the output directory for the console output if it exists
dev/etherdump.cc:
dump to the output directory if it exists
sim/builder.cc:
sim/builder.hh:
move constructor and destructor to .cc file
use a function to get the stream that the builder dumps its
output to, and create a separate file in the output directory
if able
sim/main.cc:
statStream -> outputStream
sim/serialize.cc:
dump checkpoints to the output directory if specified
sim/universe.cc:
provide an output stream for simulator output. (This takes place of the
statStream catchall that we had before)
Also provide an optional output directory that multiple simulator output
files can be written to.
--HG--
extra : convert_revision :
03abce20edbbf7ec19c9ddd8d69ec8485c383532
Nathan Binkert [Thu, 29 Jan 2004 05:37:07 +0000 (00:37 -0500)]
use $ENV{PWD} so that the amd paths work ok.
Also, compare real paths to ensure that the links point
to the right place
--HG--
extra : convert_revision :
f4127a67f02b714808c6d2181fabf245ed2309c0
Nathan Binkert [Thu, 29 Jan 2004 05:36:22 +0000 (00:36 -0500)]
cleanup on aisle 5
base/statistics.cc:
dead code
--HG--
extra : convert_revision :
8f3fd638acdf7a704475ea90b607a3225a3c174d
Andrew Schultz [Thu, 29 Jan 2004 04:00:30 +0000 (23:00 -0500)]
Remove references to dep_tree to fix build
--HG--
extra : convert_revision :
dff311c1a18bd01750c1b5902410c23e0f43b798
Ali Saidi [Thu, 29 Jan 2004 01:23:40 +0000 (20:23 -0500)]
moved devices around in config space and support figuring out cpuid
from cchip register
dev/tsunami_cchip.cc:
added support for figuring out which cpu you are
--HG--
extra : convert_revision :
7862678a259931bb0a5b2ca8ad298a704bd272ec
Ron Dreslinski [Thu, 29 Jan 2004 00:18:29 +0000 (19:18 -0500)]
Add support for PIC interrupts in IO, and DIRx interrupts in CChip
dev/tsunami_cchip.cc:
dev/tsunami_cchip.hh:
Add Interrupt capabilities for DIRx, added postDRIR and clearDRIR
functions
dev/tsunami_io.cc:
Add PIC interrupts, and post/clearPIC functions
dev/tsunami_io.hh:
Add support for PIC interrupts, added post/clearPIC functions
--HG--
extra : convert_revision :
b705568670b157c1a4496c365226526fa96e21e0
Ali Saidi [Wed, 28 Jan 2004 23:12:52 +0000 (18:12 -0500)]
our first interrupt
cpu/exetrace.cc:
added looking for symbols at PC+4 and PC+8 thanks to gcc skiping
setting the gp where it can and jumping <func>+8
dev/console.cc:
commented out weird interrupt per nate's suggestion
dev/tsunami_cchip.cc:
moved rtc flag to correct bit
dev/tsunami_io.cc:
time interrupt will be 1024Hz and at some point be configurable by
linux
dev/tsunami_io.hh:
Timer interrupt will be 1024hz for now and in the future be
configurable by linux
--HG--
extra : convert_revision :
2fcc924c8848eb3c6166d9d517617ed193a2b89a
Steve Raasch [Wed, 28 Jan 2004 23:06:07 +0000 (18:06 -0500)]
removing the last vestages of the dep-tree stuff (hasn't worked for a LONG time)
--HG--
extra : convert_revision :
145d56564ccca3a3c1c3d9115a4b8a5fb52c301d
Steve Reinhardt [Wed, 28 Jan 2004 06:26:59 +0000 (22:26 -0800)]
Minor optimization of new LRU stack code.
--HG--
extra : convert_revision :
953bc2f1ceab1cec9f48d65b94cc075655f6e9ec
Steve Reinhardt [Wed, 28 Jan 2004 03:33:59 +0000 (19:33 -0800)]
Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision :
2005ed2f551f2a80cbf62a41daaa3c4fa5af6fb3
Ron Dreslinski [Wed, 28 Jan 2004 02:36:46 +0000 (21:36 -0500)]
Add support for RTC to interrupt, HACK in alpha_console temporary
dev/alpha_console.cc:
Fix reference to tlaserclock, HACK FOR NOW
dev/alpha_console.hh:
fix reference to tlaser_clock, HACK FOR NOW
dev/tsunami.cc:
Add proper tsunami chip pointers
dev/tsunami.hh:
add proper tsunami chip pointers add RTC interrupt capabilities
dev/tsunami_cchip.cc:
Add proper Interrupt for RTC
dev/tsunami_cchip.hh:
Add proper interrupt for RTC
dev/tsunami_io.cc:
dev/tsunami_io.hh:
Make RTC interrupt
dev/tsunami_pchip.cc:
dev/tsunami_pchip.hh:
Add back pointer to tsunami
--HG--
extra : convert_revision :
2b0a8616b0bed8d9962ee5ca643dce56b9922d52
Ali Saidi [Tue, 27 Jan 2004 23:14:04 +0000 (18:14 -0500)]
uart works in linux
dev/tsunami_uart.cc:
added code make it work with linux's uart code.
--HG--
extra : convert_revision :
893a3439dac16cfe68dbd50daa475be04d9ee3de
Nathan Binkert [Tue, 27 Jan 2004 22:56:23 +0000 (17:56 -0500)]
a bunch of warning fixes
arch/alpha/isa_desc:
don't say warn: Warning:
base/misc.cc:
avoid printing two newlines in a row
sim/main.cc:
print out a message just before we enter the event queue
--HG--
extra : convert_revision :
2a824d4b67661903fc739a0fb0759aa91d72382c
Erik Hallnor [Tue, 27 Jan 2004 21:40:17 +0000 (16:40 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
47f69e4fb2d8727927e40fb6f2abf3dcab654c12
Erik Hallnor [Tue, 27 Jan 2004 21:40:04 +0000 (16:40 -0500)]
Remove SS-like code from lru.hh/cc
--HG--
extra : convert_revision :
66baf998671a24e6a630d2f35c2f529418cd4d5b
Nathan Binkert [Tue, 27 Jan 2004 18:55:50 +0000 (13:55 -0500)]
Always write out a value for pending so that an m5.fast simulator can
generate a checkpoint that an m5.debug simulator can use
--HG--
extra : convert_revision :
eec2d94013119236a9c65c9b5fb6c2ccb0480f51
Nathan Binkert [Tue, 27 Jan 2004 17:45:12 +0000 (12:45 -0500)]
Add trace flag for the sampling CPU
--HG--
extra : convert_revision :
928588d46fa069e869416f4f5df8041849625e9f
Ali Saidi [Mon, 26 Jan 2004 18:26:34 +0000 (13:26 -0500)]
Support for Tsunami coming along... RTC, PIC working, UART in progress
dev/tsunami_io.cc:
PIC, PIT, RTC implementation for tsunami working so far
dev/tsunami_io.hh:
PIT, PIC, RTC implementation for tlaser working so far
dev/tsunamireg.h:
Added RTC defines
kern/linux/linux_system.cc:
wrote cycle frequency into variable so linux doesn't probe for it.
The support exists, but it takes two seconds of time to do on a real
machine, so forever in the simulator.
--HG--
extra : convert_revision :
e0ed7f271ece4ed69c06af35d1b0e8ed848cd138
Steve Reinhardt [Mon, 26 Jan 2004 05:53:32 +0000 (21:53 -0800)]
Minor cleanup of sb_issue() in full_cpu/issue.cc.
--HG--
extra : convert_revision :
4bf69125c37a067a3a06022226a7eb38dcaaf6d1
Erik Hallnor [Sun, 25 Jan 2004 10:01:00 +0000 (05:01 -0500)]
Change the way the hierarchy is separated. Now all virtual functions are in the interfaces. This allows new bus models to be used without major hassle. And I thought it was time to change it all again anyways.
cpu/simple_cpu/simple_cpu.cc:
Switch doEvents to doEvents()
--HG--
extra : convert_revision :
14b9517017e76c7b941247004393bf260f397d9a
Ron Dreslinski [Fri, 23 Jan 2004 18:01:32 +0000 (13:01 -0500)]
Add RTC event for uip bit
dev/tsunami_io.cc:
Add RTC event to change the state of a uip bit
dev/tsunami_io.hh:
Add RTC event to change state of an uip bit
--HG--
extra : convert_revision :
acde7bdfe152d3e08f7ed53b4c8e910378f6ae67
Ali Saidi [Fri, 23 Jan 2004 00:02:07 +0000 (19:02 -0500)]
added the 8254 programmable interval timer
--HG--
extra : convert_revision :
6a111db98c05a3dd692c757611c3eb9c8cfdd32f
Ali Saidi [Thu, 22 Jan 2004 05:36:26 +0000 (00:36 -0500)]
renamed tsunami_dma to tsunami_io
dev/tsunami_io.cc:
renamed to io instead of dma since it's more than the DMA controller now
dev/tsunami_io.hh:
renamed from dma to io since it's more than dma just now
--HG--
rename : dev/tsunami_dma.cc => dev/tsunami_io.cc
rename : dev/tsunami_dma.hh => dev/tsunami_io.hh
extra : convert_revision :
4ffb69679eb7cea5725fae3446e088899f1f9315
Ali Saidi [Thu, 22 Jan 2004 05:08:48 +0000 (00:08 -0500)]
updated tsunami_dma
dev/tsunami_dma.cc:
decide actually differentiating between the different i/o requests
would be a better idea
dev/tsunami_dma.hh:
added mask and mode variables, incase they are needed
dev/tsunamireg.h:
added some i/o port defs
--HG--
extra : convert_revision :
5c7a88a8f8c8725359737b399cfa80610149a5f4
Ali Saidi [Thu, 22 Jan 2004 01:14:10 +0000 (20:14 -0500)]
one step closer to booting
dev/alpha_access.h:
removed my attempted hack to get console compling in linux
dev/tsunami.cc:
dev/tsunami.hh:
added pchip pointer to tsunami
dev/tsunami_cchip.cc:
made printing better
dev/tsunami_cchip.hh:
commented out back pointer for now, since the parser has issues with it
dev/tsunamireg.h:
added pchip registers
--HG--
extra : convert_revision :
b4fceb7d08e757d9aaf37df8eb1bcd5ae29ce0da
Erik Hallnor [Wed, 21 Jan 2004 19:22:55 +0000 (14:22 -0500)]
I hate compiling decoder.cc every time I touch something.
--HG--
extra : convert_revision :
b79519452947ea7b110922d5a3dae2f3dfc0b916
Steve Reinhardt [Tue, 20 Jan 2004 18:53:18 +0000 (13:53 -0500)]
Set LIBELF_LINUX to 0 to build on zax. Builds
but did not test... however the only thing this
affects in libelf is the header, so I don't expect
any functional problems.
base/loader/elf_object.cc:
Set LIBELF_LINUX to 0 to build on zax.
--HG--
extra : convert_revision :
d024b33deff6fc8ea6f1d465f76dc8d9d63254ab
Ali Saidi [Thu, 15 Jan 2004 22:29:35 +0000 (17:29 -0500)]
Slowly on our way to booting with Tsunami
--HG--
extra : convert_revision :
ec8e7e2dc929ad84c5e320fbfb02070e94cd1ad1
Nathan Binkert [Thu, 15 Jan 2004 21:33:58 +0000 (16:33 -0500)]
Make each stat take up one full line. This allows us to use grep
to find and remove stats from the files so we can put less
burden on the python interpreter.
base/statistics.cc:
Manually insert newlines into the python code so that we now have one
stat per line. (Make it so we can use grep -v to remove stats)
test/stattest.cc:
update to reflect changes in how python is accessed
--HG--
extra : convert_revision :
554edcf9c795b33d00d3d15554447c8accebebfa
Nathan Binkert [Thu, 15 Jan 2004 19:29:34 +0000 (14:29 -0500)]
Make the python stats script more robust
--HG--
extra : convert_revision :
a7680d5cdeac96345e8f521cfb96fccaa3e7a7f6
Nathan Binkert [Thu, 15 Jan 2004 19:29:09 +0000 (14:29 -0500)]
Make dump cycle relative
--HG--
extra : convert_revision :
3434f60fa08d1543358c1209be8a5cfbe43a53bf
Ali Saidi [Thu, 15 Jan 2004 18:22:55 +0000 (13:22 -0500)]
mereged changes to elf_object.cc
base/loader/elf_object.cc:
merged changes to elf_object.cc
--HG--
extra : convert_revision :
2b7a6083d45f0221646e2ebe5b91ee45ec8c6b7c
Steve Reinhardt [Thu, 15 Jan 2004 06:50:12 +0000 (22:50 -0800)]
Update simple-* configs to Erik's new hierarchy parameter thing.
--HG--
extra : convert_revision :
de591f6ecfc9a0a20caefb4b82084d1b2ef3433b
Steve Reinhardt [Thu, 15 Jan 2004 06:30:16 +0000 (22:30 -0800)]
Fixes and cleanup to elf loader code.
base/loader/elf_object.cc:
- Use program header instead of section headers for loading.
The old code doesn't work for Alpha/Linux user binaries.
- Deal properly with single-segment ELF executables (e.g. kernels)...
haven't tested this but it looks like it matches the functionality
of the patch the L4::Pistachio guys sent.
- Factor load symbol code into one common function.
- Some formatting to match style conventions.
- Only include libelf stuff in .cc file, not .hh.
base/loader/elf_object.hh:
- Use program header instead of section headers for loading.
The old code doesn't work for Alpha/Linux user binaries.
- Factor load symbol code into one common function.
- Only include libelf stuff in .cc file, not .hh.
--HG--
extra : convert_revision :
782062d09d43083b01e65cd645c941f49c27640a
Ron Dreslinski [Wed, 14 Jan 2004 21:21:49 +0000 (16:21 -0500)]
Add memory space implemented for range 0xffff00188
--HG--
extra : convert_revision :
ce17505cb97bf9985fd1f4992df89113a5ea3bf5
Erik Hallnor [Wed, 14 Jan 2004 21:14:15 +0000 (16:14 -0500)]
Merge codebases for CompressedMemBank and SimpleMemBank into one templatized class
--HG--
extra : convert_revision :
04feb72fc4edbbbe1b37b7f618c9fbcbc8a72358
Ali Saidi [Wed, 14 Jan 2004 21:12:00 +0000 (16:12 -0500)]
Elf loader now conforms to coding style and config files for linux
use /m5/system/linux for their binaries
base/loader/elf_object.cc:
Elf loader now conforms to coding style
--HG--
extra : convert_revision :
558e587e969535f31987f2810ee17ec72006de0a
Ali Saidi [Wed, 14 Jan 2004 09:18:20 +0000 (04:18 -0500)]
Minor fixes to loader and an additional header file in alpha_access.h
when we are compiling the console.
base/loader/elf_object.cc:
added code to verify that the .bss section is 0;
added code to only load function and label types
dev/alpha_access.h:
include inittypes if we are compiling the console code
--HG--
extra : convert_revision :
b88fb36500b1c1003d44ed95cefdd2a30b7466b8
Nathan Binkert [Wed, 14 Jan 2004 07:06:35 +0000 (02:06 -0500)]
Use the new init phase to initialized the switch event
so that we can make the first switch time relative.
--HG--
extra : convert_revision :
c81beba2e1bd8629d6c7b386bb213980434030ec
Nathan Binkert [Wed, 14 Jan 2004 07:00:20 +0000 (02:00 -0500)]
Setup initialization callbacks
--HG--
extra : convert_revision :
ec56a839a0489c5494bfcd9ead0fc3866f1e8ac2
Erik Hallnor [Tue, 13 Jan 2004 20:23:54 +0000 (15:23 -0500)]
update for new hierarchy parameters
--HG--
extra : convert_revision :
a65f77d6ab704609d9c2ae2c85d4f893fa198cf9
Erik Hallnor [Tue, 13 Jan 2004 07:10:48 +0000 (02:10 -0500)]
Merge ehallnor@zizzer:/bk/m5 into zazzer.eecs.umich.edu:/z/ehallnor/m5
--HG--
extra : convert_revision :
52437e42f15899db46525ad91b2e43c2a96ace36
Erik Hallnor [Tue, 13 Jan 2004 07:10:35 +0000 (02:10 -0500)]
Change to a new centralized way to specify the memory hierarchy parameters (do_data and do_events). If you use the defaults (false and true respectively) you don't have to change your INI files.
arch/alpha/isa_traits.hh:
Add a constant for the maximum address value called MaxAddr.
--HG--
extra : convert_revision :
1371e8b713cc6ed134093e9c208db35dc9741ac7
Ali Saidi [Tue, 13 Jan 2004 00:59:02 +0000 (19:59 -0500)]
Added code to print out the symbol if one exists for an address
cpu/exetrace.cc:
added code to print out symbol if one is found for address
kern/linux/linux_system.cc:
added code to set the debugSymbolTable to the kernel symbol table
--HG--
extra : convert_revision :
191d7608d04fa42baef5e618c0bbbf5ad4001031
Nathan Binkert [Mon, 12 Jan 2004 23:39:39 +0000 (18:39 -0500)]
- quick support for using a regular expression to select
which stats to print
- print out the subname
--HG--
extra : convert_revision :
2960bd33654e55fe0f6279b09dce42b1216188c8
Nathan Binkert [Mon, 12 Jan 2004 20:45:51 +0000 (15:45 -0500)]
Commit the correct version of the code
--HG--
extra : convert_revision :
74555b2676fe20d4a742a272b6c97e3a8a237d68
Nathan Binkert [Mon, 12 Jan 2004 18:38:37 +0000 (13:38 -0500)]
make the python stuff executable
--HG--
extra : convert_revision :
04c9ff03880f55483466e56109536b74d9163ccd
Nathan Binkert [Mon, 12 Jan 2004 18:31:59 +0000 (13:31 -0500)]
Check in python script that reads the python stats output.
Still needs a lot of work, but it's at least as good as the
normal output, and has some features that normal ouput is missing
such as bin totalling with correct formulas and totalling of
2d vectors and such. It will also filter out specific stats
for printing. (basically grep, but no mistakes.)
--HG--
extra : convert_revision :
05d0f0489483a32145cf6508122cfbc7ea57e204
Ali Saidi [Mon, 12 Jan 2004 03:00:35 +0000 (22:00 -0500)]
addad kern/linux
--HG--
extra : convert_revision :
2a14af3191a532524ee92a47b5bb6e68555010c3
Nathan Binkert [Mon, 12 Jan 2004 02:22:33 +0000 (21:22 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
bff2fb78e205f327ce8d04f3ae1b2352857ab824
Steve Reinhardt [Sun, 11 Jan 2004 23:26:48 +0000 (15:26 -0800)]
Minor cleanup to bk ignore and makefile libelf rule.
--HG--
extra : convert_revision :
77dd858344a74dea15bb36bcb0de04f3af9260f3
Steve Reinhardt [Sun, 11 Jan 2004 23:24:18 +0000 (15:24 -0800)]
Modify handling of serialize:dir parameter to make it more useful.
Move global checkpoint-related functions and vars into Checkpoint class (as statics).
arch/alpha/pseudo_inst.cc:
dev/disk_image.cc:
Move global checkpoint-related functions and vars
into Checkpoint class (as statics).
sim/serialize.cc:
Move global checkpoint-related functions and vars
into Checkpoint class (as statics).
Checkpoint constructor now takes checkpoint directory name instead
of file name.
Make serialize:dir parameter actually set checkpoint directory name
instead of directory in which checkpoint directory is created. If
the value contains a '%', the curTick value is sprintf'd into the
format to create the directory name. The default is backwards compatible
with the old fixed name ("m5.%012d").
sim/serialize.hh:
Move global checkpoint-related functions and vars
into Checkpoint class (as statics).
Checkpoint constructor now takes checkpoint directory name instead
of file name.
--HG--
extra : convert_revision :
d0aa87b62911f405a4f5811271b9e6351fdd9fe4
Steve Reinhardt [Sun, 11 Jan 2004 23:09:27 +0000 (15:09 -0800)]
Fix cprintf bug, plus minor cleanup & better error messages.
base/cprintf.cc:
Fix bug where a call with a format string with no specifiers
but one or more arguments would crash. Old code tried to print
extra args using last available format, but in this case there
was no format, hence the problem. Now we just print "<extra arg>"
for each extra arg.
Also reorganized code a bit to make scope of fmt variable
match the scope in which you can be confident it's meaningful.
base/cprintf.hh:
Print specific error message instead of calling format_invalid().
base/cprintf_formats.hh:
Clear Format object in constructor.
Use specific error messages instead of format_invalid() function.
--HG--
extra : convert_revision :
87d5e902174e3eb2583131d056742af166540db0
Ali Saidi [Fri, 9 Jan 2004 03:42:21 +0000 (22:42 -0500)]
the build directory is now correctly created
--HG--
extra : convert_revision :
4a7b91821e2de64e400417f8ac503af7e596571d
Ali Saidi [Thu, 8 Jan 2004 21:35:47 +0000 (16:35 -0500)]
Fixed another small libelf problem, everything should work now, on any
machine.
base/loader/elf_object.hh:
put #defines for libelf that normally arn't defined so that -Wundef
doesn't cause problems.
--HG--
extra : convert_revision :
fa2de6aa94c7ddbaa59990db4473402b0df7d93a
Ali Saidi [Thu, 8 Jan 2004 19:13:31 +0000 (14:13 -0500)]
should now build... fixed relative path problem
--HG--
extra : convert_revision :
78c9445993a84b68be1b0a477555246f1ea6ce0c
Nathan Binkert [Thu, 8 Jan 2004 17:25:49 +0000 (12:25 -0500)]
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest
--HG--
extra : convert_revision :
b7411b25ae9e3a546996aec59e1a67cbe728da85
Ali Saidi [Thu, 8 Jan 2004 00:46:45 +0000 (19:46 -0500)]
Changed elf_object.* to use libelf for reading elf files. The makefile
and setup filed had to be modified to build libelf. The ext repository
MUST exist in the directory below m5!
base/loader/elf_object.cc:
base/loader/elf_object.hh:
now uses libelf to read elf binaries
--HG--
extra : convert_revision :
b70511f5379edf35d639f3bb64b786cb0bd180af
Nathan Binkert [Sun, 28 Dec 2003 17:48:13 +0000 (12:48 -0500)]
Improve python output support
fix some bugs
base/statistics.cc:
- Move the python dump stream stuff into the statistics package
because it needs more control over the file when there
are multiple dumps
- add a subname to the output
- make all of the stats a list instead of variable arguments to
get around the 255 argument limit
- the description needs to be triple quoted
- avoid errors for formulas that don't have any root element
set up.
base/statistics.hh:
- get rid of mode_python and just separate python dumping from
regular stats dumping
- fix a huge bug that made a Formula use a VectorData instead
of a FormulaData
--HG--
extra : convert_revision :
7303cff3ccdcc3d306ab17375219fc7fecac7e5e
Erik Hallnor [Sun, 28 Dec 2003 05:41:47 +0000 (00:41 -0500)]
Add a uni-directional bus bridge
--HG--
extra : convert_revision :
37d30638eb0d988fc1089c7945f535e2979ca8e4
Nathan Binkert [Wed, 24 Dec 2003 08:25:36 +0000 (03:25 -0500)]
Add python output support to the statistics package!
base/statistics.cc:
base/statistics.hh:
- add python output support to the statistics package
- each statistic type has a python() member function that takes
a Python object to which the stat will output it's python
representation
- add getStatData hack so that the StatData pointer can be looked
up by the proxies with their opaque pointer to the stat they're
proxying for. This is necessary because the proxy really proxies
for the bin and not the stat. Be nice to figure out how to get
rid of it. The hack is used so that the str() function of a
proxy can properly name itself.
- To print formula stats, every stat has a str() function that
converts that stat to a string that python can execute to get
a value.
test/Makefile:
add python stuff
test/stattest.cc:
add more tests and test python support
--HG--
extra : convert_revision :
513814ab0a125606897f2c57dccdf22879032ef9
Nathan Binkert [Wed, 24 Dec 2003 07:35:33 +0000 (02:35 -0500)]
initial basic hooks into the stats package to output python code
python dumping takes a name for the output data
base/statistics.cc:
base/statistics.hh:
initial basic hooks into the stats package to output python code
--HG--
extra : convert_revision :
37f52dc03df50aa90346dc9ca341f961e7e855e8
Nathan Binkert [Wed, 24 Dec 2003 07:25:26 +0000 (02:25 -0500)]
Random cleanup
base/statistics.hh:
- use a typedef to get at bin_t
- clean up template declaration
- public access to typedefs
--HG--
extra : convert_revision :
0650c5a1cba51c7af04790498af0d354884be0ee
Nathan Binkert [Wed, 24 Dec 2003 07:22:43 +0000 (02:22 -0500)]
formatting for consistency
--HG--
extra : convert_revision :
f859244880dcc2be9424edaac0c73adfd467221e
Nathan Binkert [Wed, 24 Dec 2003 07:17:20 +0000 (02:17 -0500)]
more readable formatting
--HG--
extra : convert_revision :
99bd142099482dbd04645a0f44ac63d2467b883c
Nathan Binkert [Wed, 24 Dec 2003 06:45:56 +0000 (01:45 -0500)]
Random cleanup to make things work a bit better
base/statistics.cc:
- give an internal name to statistics that aren't printable
- speed up reset a tad
- Make sure that the original value of the current bin is restored properly
- check for the case where there are no subnames so we don't have an error
- check to make sure that the formula's root is set before accessing it
base/statistics.hh:
- clean up includes a bit
- deal with the case where there are no subnames
- get rid of remnants of FS_MEASURE stuff
--HG--
extra : convert_revision :
1e4338fc2b225647df47641b04c13b7046b2e114
Nathan Binkert [Wed, 24 Dec 2003 05:22:02 +0000 (00:22 -0500)]
never print the cdf or pdf or the overflow bucket if we're simplescalr
--HG--
extra : convert_revision :
921ad80a5c671fee9eab3f389636dccc101d18f6