f4d0f92855
Miscellaneous minor fixes.
Kevin Lim
2006-06-16 17:15:18 -04:00
baba18ab92
Two updates that got combined into one ChangeSet accidentally. They're both pretty simple so they shouldn't cause any trouble.
Kevin Lim
2006-06-16 17:08:47 -04:00
720e6c4145
Checker updates.
Kevin Lim
2006-06-16 13:10:47 -04:00
51a5b82637
Initial changes to allowed DetailedCPU to work with other architectures (i.e. Sparc & MIPS)
Korey Sewell
2006-06-15 22:01:28 -04:00
b1fc43dd59
Merge zizzer:/bk/newmem into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
Ali Saidi
2006-06-15 15:05:26 -04:00
f06d508af0
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
Steve Reinhardt
2006-06-15 11:46:13 -04:00
88e22ee081
Get Port stuff working with full-system scripts. Key was adding support for cloning port references (trickier than it sounds). Got rid of class/instance thing and go back to instance cloning... still don't allow changing SimObject parameters/children after a class (instance) has been subclassed or instantiated (or cloned), which should avoid bizarre unintended behavior.
Steve Reinhardt
2006-06-15 11:45:51 -04:00
74b9868c78
Mips Code Cleanup: Fix some author stuff and copyright dates Take out full system code
Korey Sewell
2006-06-15 01:00:15 -04:00
1c55389578
tried to undo change and it didnt work so might as well put it back
Korey Sewell
2006-06-14 22:01:36 -04:00
7b44630b95
change back, BK is acting up
Korey Sewell
2006-06-14 19:53:36 -04:00
07e679fe85
add a comment that should be able to pass --help after config file
Ali Saidi
2006-06-14 16:12:56 -04:00
2a9becba44
Merge zizzer:/bk/newmem into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
Korey Sewell
2006-06-14 14:43:45 -04:00
5d11e8bff6
Minor code cleanup of BaseDynInst.
Kevin Lim
2006-06-14 13:12:41 -04:00
185ec39f79
Merge zizzer:/bk/newmem into vm1.(none):/home/stever/bk/newmem
Steve Reinhardt
2006-06-13 23:19:42 -04:00
e981a97dec
Move SimObject creation and Port connection loops into Python. Add Port and VectorPort objects and support for specifying port connections via assignment. The whole C++ ConfigNode hierarchy is gone now, as are C++ Connector objects.
Steve Reinhardt
2006-06-13 23:19:28 -04:00
7709e6ba93
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-13 22:40:02 -04:00
133903b28d
Add in a few global options. Feel free to rename them, they're just the first thing that came to mind.
Kevin Lim
2006-06-13 22:39:31 -04:00
2f043aafbc
Minor updates for stats.
Kevin Lim
2006-06-13 22:35:05 -04:00
285b88a57b
allow long opts to m5 and add a help flag back.
Ali Saidi
2006-06-13 16:53:26 -04:00
dcf02c25e3
Make syscalls serialize after instructions so they work properly on the new CPU model.
Kevin Lim
2006-06-13 14:39:05 -04:00
4ad3d47464
Add itb and dtb to checker when in full system mode.
Kevin Lim
2006-06-13 14:37:50 -04:00
72e4b98b8d
Add in DetailedCPU to test.
Kevin Lim
2006-06-13 14:15:24 -04:00
e715e298e0
Merge zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
Korey Sewell
2006-06-13 12:07:48 -04:00
66af2a7bf4
Merge ktlim@zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-13 11:58:05 -04:00
7bcab0803f
Compile fix.
Kevin Lim
2006-06-13 11:38:16 -04:00
6ee38f143e
Merge ktlim@zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-12 19:15:14 -04:00
b5cf61efad
Fixes for checker. The RC/RS instructions check the interrupt flag, which isn't verifiable by the checker.
Kevin Lim
2006-06-12 19:11:38 -04:00
6152e8abc3
Fix output messages.
Kevin Lim
2006-06-12 19:05:48 -04:00
4acb283496
Clean up/shift some code around.
Kevin Lim
2006-06-12 19:04:42 -04:00
fbf3a82c5c
Fix compile error.
Kevin Lim
2006-06-12 18:59:24 -04:00
5639fb2c43
Fix memory leak.
Kevin Lim
2006-06-12 18:58:29 -04:00
07f21ce913
Merge zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
Korey Sewell
2006-06-12 18:16:05 -04:00
841d0b9d40
Merge fixes to make full system compile and run.
Kevin Lim
2006-06-12 17:53:57 -04:00
3e1537cf8b
Removed syscall function from thread_context.hh. ThreadContext is the interface for external, non-CPU objects to access the thread, so they probably shouldn't be able to call syscall(). The case it was being used for was already handled by the ISA code.
Kevin Lim
2006-06-12 16:42:56 -04:00
b0fc2c02af
Merge zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
Korey Sewell
2006-06-12 16:19:18 -04:00
babb22eea4
Fix python binary name in arch/SConscript. Also delete no-longer-needed SPARC test.py files (should have gone with my last chnageset where LiveProcess became ISA-independent).
Steve Reinhardt
2006-06-12 06:19:13 -04:00
15a8f05060
Merge m5.eecs.umich.edu:/bk/newmem into ewok.(none):/home/gblack/m5/newmem
Gabe Black
2006-06-12 00:49:24 -04:00
60a734e175
Made isHyperPriv and isPriv protected member variables.
Gabe Black
2006-06-12 00:44:24 -04:00
df4b4f001e
Merge zizzer.eecs.umich.edu:/bk/newmem into iceaxe.:/Volumes/work/research/m5/newmem
Nathan Binkert
2006-06-11 23:02:50 -04:00
3c95f5958f
Merge iceaxe.:/Volumes/work/research/m5/head into iceaxe.:/Volumes/work/research/m5/merge
Nathan Binkert
2006-06-11 22:01:34 -04:00
e0140202bd
Move LiveProcess::create() from arch-specific files bcak to main LiveProcess, then automatically select ISA based on object file type. Now simulation scripts no longer need to care about the ISA, as they can just call LiveProcess().
Steve Reinhardt
2006-06-11 21:49:46 -04:00
d3a5783523
Add some utility functions to ease handling SimObjects and sequences of SimObjects in a uniform manner.
Steve Reinhardt
2006-06-11 20:37:56 -04:00
13d46e2075
Remove Full System Files
Korey Sewell
2006-06-11 19:04:22 -04:00
4ab8e881ed
Fix compiling for SPARC_SE: - change include from exec_context.hh -> threadcontext.hh - g++ 4.0.3 complaint about broken code (which it was). - bad merge thread_context -> exec_context
Ali Saidi
2006-06-11 17:21:02 -04:00
167fb86a69
Merge zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release
Korey Sewell
2006-06-11 17:11:36 -04:00
804a7efa3c
next round of MIPS ISA changes
Korey Sewell
2006-06-11 15:38:40 -04:00
6a0c5b9fad
Edit Fetch DPRINT in simple CPU
Korey Sewell
2006-06-11 14:38:14 -04:00
bb58e4b851
Don't allow SimObject-valued class params to be set after the class has been instantiated or subclassed. This is one of the main situations that leads to confusing results.
Steve Reinhardt
2006-06-10 21:13:36 -04:00
39f85a1de4
Only allow SimObject classes to be instantiated (no cloning!). Provide a makeClass() method to generate a new class using a SimObject instance as a template. All instantiation, subclassing, and class generation is done recursively using "deep copy"-style memoization to maintain object relationships in the face of multiple references to shared objects/classes.
Steve Reinhardt
2006-06-10 19:58:36 -04:00
7af93dbdf6
Remove all binning stuff
Nathan Binkert
2006-06-10 13:08:43 -04:00
cd65504739
Update scripts for testing ALPHA_FS and MIPS_SE. Minor fixes to ALPHA_FS and SPARC_SE. SPARC_SE still does not compile... looks like there are unresolved issues with ExecContext -> ThreadContext rename/reorg.
Steve Reinhardt
2006-06-10 00:22:42 -04:00
f693b451a5
Fix up imports in Ozone objects/*.py files.
Steve Reinhardt
2006-06-09 23:33:15 -04:00
95019d0c6f
Merge vm1.(none):/home/stever/bk/newmem into vm1.(none):/home/stever/bk/newmem-py
Steve Reinhardt
2006-06-09 23:18:46 -04:00
29e34a739b
Move main control from C++ into Python. User script now invokes initialization and simulation loop after building configuration. These functions are exported from C++ to Python using SWIG.
Steve Reinhardt
2006-06-09 23:01:31 -04:00
c14c78fa3e
Removing of old code and adding in new comments.
Kevin Lim
2006-06-09 16:28:17 -04:00
4b732e43a6
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-09 12:29:40 -04:00
a7f5f54ff8
Allow for fetch to retry access if the sendTiming call fails.
Kevin Lim
2006-06-09 12:29:31 -04:00
02606ebb26
Fix allocating requests twice on retries.
Kevin Lim
2006-06-09 12:28:11 -04:00
e6a6204b17
Remove obsolete stuff.
Kevin Lim
2006-06-09 12:25:55 -04:00
068379a9ed
Fixes for some outstanding issues in the LSQ. It should now be able to retry. It should also be able to handle LL/SC (through hacks) for the UP case.
Kevin Lim
2006-06-09 11:46:35 -04:00
68e470f78a
Merging in a month of changes
Korey Sewell
2006-06-09 03:57:25 -04:00
6875e8d839
add nacked result and a function to swizzle nacked packet into something that can be sent out again implement ability for i/o devices to handle
Ali Saidi
2006-06-08 19:43:50 -04:00
8ee856f1d5
add write/read functions that have endian conversions in them when we get a virtual port delete it (even though delete does nothing in these cases)
Ali Saidi
2006-06-08 19:03:58 -04:00
f5b6aef154
Tell checker that an instruction is completed prior once it does the access to memory. As long as the checker does not access memory to verify the store's data (currently impossible in the O3 model), this will work fine.
Kevin Lim
2006-06-08 17:04:41 -04:00
1ef5585fee
Creation of translating port pushed off to CPU.
Kevin Lim
2006-06-08 17:02:48 -04:00
cf79dba504
Get O3 CPU mostly working in full system, and fix an FP bug that showed up.
Kevin Lim
2006-06-08 16:58:50 -04:00
bf6e176554
Update copyright.
Kevin Lim
2006-06-07 16:02:55 -04:00
54d4220b00
Reorganization/renaming of CPUExecContext. Now it is called SimpleThread in order to clear up the confusion due to the many ExecContexts. It also derives from a common ThreadState object, which holds various state common to threads across CPU models.
Kevin Lim
2006-06-07 15:29:53 -04:00
6915513b97
Move checker's exec_context.hh to match the other changes. Also add in some more comments.
Kevin Lim
2006-06-07 15:17:34 -04:00
3e191b1477
Clear misc regs at startup.
Kevin Lim
2006-06-07 14:46:18 -04:00
eb0e416998
Change ExecContext to ThreadContext. This is being renamed to differentiate between the interface used objects outside of the CPU, and the interface used by the ISA. ThreadContext is used by objects outside of the CPU and is specifically defined in thread_context.hh. ExecContext is more implicit, and is defined by files such as base_dyn_inst.hh or cpu/simple/base.hh.
Kevin Lim
2006-06-06 17:32:21 -04:00
0f014e4340
Fix checker to work in newmem in SE mode.
Kevin Lim
2006-06-06 14:06:30 -04:00
090496bf2d
Fixes to get new CPU model working for simple test case. The CPU does not yet support retrying accesses.
Kevin Lim
2006-06-05 18:14:39 -04:00
295c7a908c
Same fix for -P option as Steve's previous fix.
Kevin Lim
2006-06-05 14:49:14 -04:00
cfe22d61d9
Merge ktlim@zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-05 13:39:53 -04:00
6fa1146406
Fix --var=val arg handling.
Steve Reinhardt
2006-06-05 13:38:07 -04:00
9be1e13f99
Merge ktlim@zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-04 22:14:17 -04:00
07a7de5e57
Fixes to get everything working again.
Kevin Lim
2006-06-04 22:13:42 -04:00
984c2a4ff6
Merge ktlim@zamp:/z/ktlim2/clean/m5-o3 into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge
Kevin Lim
2006-06-04 16:07:54 -04:00
3156f601db
Fix for full system compiling.
Kevin Lim
2006-06-04 15:36:51 -04:00
d2d581cf01
Merge ktlim@zizzer:/bk/newmem into zizzer.eecs.umich.edu:/.automount/zamp/z/ktlim2/clean/newmem
Kevin Lim
2006-06-02 18:19:50 -04:00
7940c10ace
Fixes to get compiling to work. This is mainly fixing up some includes; changing functions within the XCs; changing MemReqPtrs to Requests or Packets where appropriate.
Kevin Lim
2006-06-02 18:15:20 -04:00
8671d927d8
Add in comments for checker.
Kevin Lim
2006-06-01 15:40:06 -04:00
51ed3c3fd9
Fix stat bug.
Kevin Lim
2006-06-01 15:39:45 -04:00
5802c46c3b
remove unneeded files that were copied directly from alpha
Ali Saidi
2006-05-31 19:38:46 -04:00
cb0cf2dd8a
Updated Authors from bk prs info
Ali Saidi
2006-05-31 19:26:56 -04:00
4d8ea8dc47
Merge zizzer:/bk/newmem into zeep.pool:/z/saidi/work/m5.newmem
Ali Saidi
2006-05-31 13:47:35 -04:00
0193c3fe7d
make io device be a little nicer about scheduling retries on the bus
Ali Saidi
2006-05-31 13:45:37 -04:00
a514bf2150
Comments and code cleanup.
Kevin Lim
2006-05-31 11:45:02 -04:00
d4b73086b6
Merge ktlim@zizzer:/bk/newmem into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem
Kevin Lim
2006-05-31 11:34:42 -04:00
d77d39daee
Streamline interface to Request object.
Steve Reinhardt
2006-05-31 00:12:29 -04:00
Kevin Lim