Ali Saidi [Mon, 27 Mar 2006 02:44:22 +0000 (21:44 -0500)]
Add the bus and connector objects to scons
change getPort parameter from char* to string
Add an extra phase between construction and init called connect
SConscript:
Add the bus and connector objects to scons
cpu/simple/cpu.cc:
cpu/simple/cpu.hh:
the connection to memory shouldn't be made until we know the memory
object exists (e.g. after construction)
dev/io_device.hh:
change to const string
mem/bus.hh:
change getPort parameter from char* to string
initialize num_interfaces
mem/mem_object.hh:
change getPort parameter from char* to string
mem/physical.cc:
mem/physical.hh:
change getPort parameter from char* to string
get rid of the bus object I created last time
python/m5/objects/PhysicalMemory.py:
get rid of the bus object I created last time
sim/main.cc:
sim/sim_object.cc:
sim/sim_object.hh:
Add an extra phase between construction and init called connect
--HG--
extra : convert_revision :
0e994f93374fa72a06d291655c440ff1b8e155a9
Ali Saidi [Sat, 25 Mar 2006 23:34:50 +0000 (18:34 -0500)]
update for objects having a bus
--HG--
extra : convert_revision :
96b5494b7d0b5ca702ac69cfa0bf8c4d44e1cc3b
Ali Saidi [Sat, 25 Mar 2006 23:31:20 +0000 (18:31 -0500)]
Implement a very very simple bus
requestTime -> time
responseTime -> packet.time
Make CPU and memory able to connect to the bus
dev/io_device.cc:
update for request and packet both having a time
hand platform off to port for eventual selection of request modes
dev/io_device.hh:
update for request and packet both havig a time
hand platform off to port for eventual selection of request modes
mem/bus.hh:
Add a device map struct that maps a range to a portId
- Which needs work it theory it should be an interval tree
- but it is a list and works fine right now
Add a function called findPort which returns port for an addr range
Add a deviceBlockSize function that really shouldn't exist, but it
was easier than fixing the translating port
mem/packet.hh:
add a time to each packet
mem/physical.cc:
mem/physical.hh:
python/m5/objects/PhysicalMemory.py:
Make physical memory take a MemObject parameter of what to connect to
mem/request.hh:
remove requestTime/responseTime for just time in request which
is requset time and the time in the packet which is responsetime
python/m5/objects/BaseCPU.py:
Instead of memory cpu connects to any memory object
python/m5/objects/Bus.py:
Fix for new bus object
--HG--
extra : convert_revision :
72605e8a3fcdd9e80a41f439909ee7feb3f1fe1d
Ali Saidi [Tue, 21 Mar 2006 20:45:40 +0000 (15:45 -0500)]
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
45dba22ecbdfc8e1bb0df1efd06a37f40d56b67f
Ali Saidi [Tue, 21 Mar 2006 20:45:31 +0000 (15:45 -0500)]
Make PioPort/DmaPort,DmaDevice/PioDevice compile.
Add another type to the PacketResult enum of Unknown
Seperate time into requsetTime and responseTime.
dev/io_device.cc:
dev/io_device.hh:
Make PioPort/DmaPort,DmaDevice/PioDevice compile.
mem/packet.hh:
Add another type to the PacketResult enum of Unknown (e.g. no state set yet)
mem/request.hh:
Seperate time into requsetTime and responseTime.
--HG--
extra : convert_revision :
c6394cb838013296caea6492275252b8cae2882f
Korey Sewell [Sun, 19 Mar 2006 18:41:04 +0000 (13:41 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision :
db8490e41ec17fc8f4e2dc9548ecdc7d28b4cdd1
Korey Sewell [Sun, 19 Mar 2006 18:40:03 +0000 (13:40 -0500)]
support for unaligned memory access
arch/mips/isa/base.isa:
disassembly fixes
arch/mips/isa/decoder.isa:
support for unaligned loads/stores
arch/mips/isa_traits.hh:
edit Syscall Reg values
arch/mips/linux_process.cc:
call writevFunc on writev syscall
--HG--
extra : convert_revision :
4aea6d069bd7ba0e83b23d2d85c50d68532f0454
Steve Reinhardt [Sat, 18 Mar 2006 19:42:21 +0000 (14:42 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
sim/process.cc:
Fix bad auto merge (m5 changes unnecessary in newmem).
--HG--
extra : convert_revision :
a3ced4cd1668cd47bd02430872ca68b1433aae98
Korey Sewell [Sat, 18 Mar 2006 16:31:31 +0000 (11:31 -0500)]
more syscall fixes
arch/mips/isa_traits.hh:
use syscall return function from alpha
arch/mips/linux_process.cc:
fix some syntax errors, map some functions to the desc. table
--HG--
extra : convert_revision :
75e8e8893b7d96bb4fc8e8eced53bd16c0a727d1
Korey Sewell [Sat, 18 Mar 2006 15:52:19 +0000 (10:52 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision :
1646b4fb065e3ed9d8de22e3f5c3aa05a2ef01b6
Korey Sewell [Sat, 18 Mar 2006 15:51:28 +0000 (10:51 -0500)]
steps toward making syscalls work
arch/mips/isa/decoder.isa:
arch/mips/isa_traits.hh:
sim/syscall_emul.cc:
make syscall instruction functional
arch/mips/linux_process.cc:
add all MIPS/Linux syscalls to descriptor list
--HG--
extra : convert_revision :
5455a345e76be921e9f63b248aef874b6358e465
Gabe Black [Fri, 17 Mar 2006 19:25:54 +0000 (14:25 -0500)]
Fixed a couple typos
--HG--
extra : convert_revision :
2ffbfc4755e46a119c9709d6a5e9ddc41fde45e0
Gabe Black [Fri, 17 Mar 2006 19:23:48 +0000 (14:23 -0500)]
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
arch/sparc/isa/decoder.isa:
Hand merged
--HG--
extra : convert_revision :
5d5338602c48be48978972a091c5e93f9dd775aa
Gabe Black [Fri, 17 Mar 2006 19:11:14 +0000 (14:11 -0500)]
An attempt to get byteswap to work accross more machines.
--HG--
extra : convert_revision :
4a73507206cf287a89e1d496b2a08cfd1fafdf4d
Gabe Black [Fri, 17 Mar 2006 19:02:38 +0000 (14:02 -0500)]
Clean up and fix for compilation
--HG--
extra : convert_revision :
c4e66cd678313f7fe169787cb1bf3e45f114c4fd
Ali Saidi [Fri, 17 Mar 2006 04:09:01 +0000 (23:09 -0500)]
clean up condition codes a little bit
put back in Tcc code that was deleted in last merge
arch/sparc/isa/bitfields.isa:
clean up condition codes a little bit
--HG--
extra : convert_revision :
c554fd5c3ee8cfd6643f69f8351124a7a4b5d9fa
Korey Sewell [Fri, 17 Mar 2006 00:01:09 +0000 (19:01 -0500)]
fix to LiveProcess (this change got deleted somehow)
--HG--
extra : convert_revision :
fe4b7dc5b7d583e1d890648ba98bb0daf722a704
Korey Sewell [Thu, 16 Mar 2006 23:40:54 +0000 (18:40 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision :
02fe0b0170348dc6f6a985c15123806088a8c23e
Korey Sewell [Thu, 16 Mar 2006 23:39:54 +0000 (18:39 -0500)]
Found and fixed 3 decoder.isa bugs!!! Now the hello_world program runs for a while
before getting in a infinite loop. It actually "tries" to syscall too, but syscalls
aren't implemented just yet
arch/mips/faults.cc:
more descriptive names for faults (will help future users as well as me!)
arch/mips/isa/base.isa:
make sure we are printing out "BasicOp" format disassembly instructions as dest,src,src instead of src,src,dest
arch/mips/isa/decoder.isa:
FIX LW/SW Bug!!!! I was actually loading a byte instead of a word
FIX JALR Bug!!!! I was not saving the link address in R31 for this instruction
FIX SLL/NOP Bug!!! We now recognize the varying flavors of sll,nop,ehb,& ssnop correctly
base/loader/elf_object.cc:
change back to original way
base/loader/elf_object.hh:
change back to original!
--HG--
extra : convert_revision :
39b65fba31c1842ac6966346fe8a35816a4231fa
Gabe Black [Thu, 16 Mar 2006 19:08:31 +0000 (14:08 -0500)]
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
arch/sparc/isa/decoder.isa:
SCCS merged
--HG--
extra : convert_revision :
460843b49bc96b3fbc5897828c23f9cf9b010ae0
Gabe Black [Thu, 16 Mar 2006 18:58:50 +0000 (13:58 -0500)]
Fixups towards compiling.
arch/alpha/types.hh:
Moved the DependenceTags enum from types to constants.
arch/sparc/faults.cc:
arch/sparc/faults.hh:
Corrected a misspelling of PriviledgeOpcode and PrivilegedAction.
arch/sparc/isa/formats.isa:
Fixups towards compiling. Added a few additional instruction formats.
--HG--
extra : convert_revision :
4c5506877b71b8a5c8c45db41192cf759cdac374
Ron Dreslinski [Thu, 16 Mar 2006 16:34:19 +0000 (11:34 -0500)]
Don't forget to check in the needed header file for the conditional prefetch building.
--HG--
extra : convert_revision :
2c2562da323fa1249af72af3a89c7666c745ae2b
Steve Reinhardt [Thu, 16 Mar 2006 15:31:00 +0000 (10:31 -0500)]
Add warning for ignored loadable ELF segments.
base/loader/elf_object.cc:
Print warning if there are more than two loadable segments.
We currently assume there are at most two (text & data), and that's
held so far, but it would be nice not to silently ignore others.
--HG--
extra : convert_revision :
1b3e693e95ba1210b09528b97819a7fa86426edc
Korey Sewell [Thu, 16 Mar 2006 04:38:55 +0000 (23:38 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips
--HG--
extra : convert_revision :
9bdde9b5bd3049744451eda1134f080b7c4b1b59
Ali Saidi [Wed, 15 Mar 2006 23:12:01 +0000 (18:12 -0500)]
implement the Tcc instruction to call syscall.
arch/sparc/isa/bitfields.isa:
the trap field is 7:0
arch/sparc/isa/decoder.isa:
add code to in the Tcc instruction to call a syscall
arch/sparc/isa_traits.hh:
We need the syscall num register
--HG--
extra : convert_revision :
0861ec1dd8c7cac57765b22bc408fdffbe63fe2a
Ron Dreslinski [Wed, 15 Mar 2006 22:53:49 +0000 (17:53 -0500)]
Merge zizzer:/z/m5/Bitkeeper/m5
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/m5
--HG--
extra : convert_revision :
a4de274ec50821218121ba38f9215f2348262c27
Ron Dreslinski [Wed, 15 Mar 2006 22:53:21 +0000 (17:53 -0500)]
Add support for conditional compiling in of prefetchers.
--HG--
extra : convert_revision :
357554632f102224357c8c3848bc4bc7cbb9dc54
Ali Saidi [Wed, 15 Mar 2006 22:04:50 +0000 (17:04 -0500)]
add translations for new sections that are mmapped or when the brk
is changed
Add a default machine width parameter
Arch based live processes
arch/alpha/linux/process.cc:
arch/alpha/linux/process.hh:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
arch/alpha/tru64/process.hh:
arch/mips/linux_process.cc:
arch/mips/process.cc:
arch/mips/process.hh:
arch/sparc/linux/process.cc:
arch/sparc/linux/process.hh:
arch/sparc/process.cc:
arch/sparc/process.hh:
configs/test/test.py:
python/m5/objects/Process.py:
sim/process.cc:
sim/process.hh:
Architecture based live processes
arch/mips/isa_traits.hh:
arch/sparc/isa_traits.hh:
Add a default machine width parameter
mem/port.hh:
gcc 4 really wants a virtual destructor
sim/byteswap.hh:
remove the comment around long and unsigned long even though uint32_t
and int32_t are defined. Seems to work with gcc 4 and 3.4.3.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
add translations for new sections that are mmapped or when the brk
is changed
--HG--
extra : convert_revision :
e2f9f228113c7127c87ef2358209a399c30ed5c6
Korey Sewell [Wed, 15 Mar 2006 21:29:18 +0000 (16:29 -0500)]
add mips simple test in config directory
configs/test/hello_mips:
hello world mips binary
--HG--
extra : convert_revision :
5a495e1bfb1cbddc0879f8e80c02bd7435a02acb
Korey Sewell [Wed, 15 Mar 2006 21:26:40 +0000 (16:26 -0500)]
infinitesimal small baby steps toward MIPS actually working
arch/mips/isa/formats/branch.isa:
let user know that we alter r31 in disassembly
arch/mips/isa_traits.cc:
add copyRegs function ...
comment out serialize float code for now
arch/mips/isa_traits.hh:
make FloatRegFile a class ... change values of architectural regs
arch/mips/process.cc:
change MIPS to Mips
base/loader/elf_object.cc:
get global pointer initialized to a value
base/loader/elf_object.hh:
Add global_ptr to elf_object constructor
base/loader/object_file.hh:
MIPS to Mips
base/traceflags.py:
SimpleCPU trace flag
cpu/simple/cpu.cc:
DPRINTF flags for SimpleCPU
cpu/static_inst.hh:
Add Decoder functions to static_inst.hh
--HG--
extra : convert_revision :
0544a8524d3fe4229428cb06822f7da208c72459
Kevin Lim [Wed, 15 Mar 2006 20:38:14 +0000 (15:38 -0500)]
Don't access init_regs directly. This does not affect newmem; Steve already changed this in newmem.
--HG--
extra : convert_revision :
19b1ed0bb2c8bcde72843e62f73635e84adf95b5
Korey Sewell [Tue, 14 Mar 2006 23:30:09 +0000 (18:30 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision :
054833d2f7019b9a1247efc4451ccb143242059d
Korey Sewell [Tue, 14 Mar 2006 23:28:51 +0000 (18:28 -0500)]
Minor Sconscript edit ... mips decoder changes ... initialize NNPC and output fault name in simple cpu
SConscript:
Separate Alpha EIO from syscall building for other architectures
arch/isa_specific.hh:
change MIPS constant to 34k
arch/mips/isa/decoder.isa:
Allow sll,ssnop,nop, and ehb to be determined through decoder using
the different types of default cases
arch/mips/isa/formats/branch.isa:
Delete debug code
arch/mips/isa/formats/noop.isa:
add a Nop format
arch/mips/isa_traits.hh:
use constants instead of enums
arch/mips/process.cc:
point to the correct header file
cpu/simple/cpu.cc:
Output the actual fault name
sim/process.cc:
Inititalize NNPC
--HG--
extra : convert_revision :
adb0026dfad25b14c98fb03c98bfe9c681bba6f8
Ron Dreslinski [Tue, 14 Mar 2006 23:03:34 +0000 (18:03 -0500)]
Remove unneeded header files.
Add some forward declerations.
Fix ordering problem of variables in constructor (see sourceforge)
Factor out code from header into _impl file to speed building process (keep cache_builder smaller in size)
--HG--
extra : convert_revision :
20087f88f95628af716094e09c2287e09580149e
Gabe Black [Tue, 14 Mar 2006 21:41:38 +0000 (16:41 -0500)]
added *.swp
--HG--
extra : convert_revision :
90e4387da5bbe5e3f05c4d25713d6a362c6724e8
Gabe Black [Tue, 14 Mar 2006 21:39:59 +0000 (16:39 -0500)]
Fixed up after a hand merge.
arch/alpha/utility.hh:
Got rid of unnecessary extern and static qualifiers, and fixed up the hand merge.
arch/sparc/regfile.hh:
Fixed up SPARC after a hand merge.
--HG--
extra : convert_revision :
56e2d90ddd144f3386dbea50fa96cfc461d46b81
Gabe Black [Tue, 14 Mar 2006 21:08:32 +0000 (16:08 -0500)]
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
cpu/cpu_exec_context.cc:
Hand merge
--HG--
rename : arch/alpha/registerfile.hh => arch/alpha/regfile.hh
extra : convert_revision :
bd18966f7c37c67c2bc7ca2633b58f70ce64409c
Gabe Black [Tue, 14 Mar 2006 21:05:44 +0000 (16:05 -0500)]
Moved registerfile.hh to regfile.hh
--HG--
rename : arch/alpha/registerfile.hh => arch/alpha/regfile.hh
extra : convert_revision :
27df93cd2259dab85057f966c801c0db2cb6f022
Gabe Black [Tue, 14 Mar 2006 21:01:21 +0000 (16:01 -0500)]
Added the sparc regfile.hh to bitkeeper
--HG--
extra : convert_revision :
7bc8ca989a4f0225ad5644980c8dbc34b0c0e35f
Gabe Black [Tue, 14 Mar 2006 20:59:19 +0000 (15:59 -0500)]
SPARC clean up towards compilability.
--HG--
extra : convert_revision :
156670995fa61599e763b002cd70f31f19b108d1
Gabe Black [Tue, 14 Mar 2006 20:58:05 +0000 (15:58 -0500)]
Missed this in the float register changeset.
--HG--
extra : convert_revision :
35e967fb39fc16e38da13ab1a093d7d0916cffeb
Gabe Black [Tue, 14 Mar 2006 20:57:28 +0000 (15:57 -0500)]
Moved some full system functions into utility.hh
--HG--
extra : convert_revision :
dd2cd11213890b30975fdabdf7d9bc4652511434
Gabe Black [Tue, 14 Mar 2006 20:55:00 +0000 (15:55 -0500)]
Changed the floating point register file into a class with appropriate accessor functions. The width of the floating point register to access can be specified, and if not, it will be accessed at its "natural" width. That is, the width of each individual register. Also, the functions which access the bit representation of floating point registers can use the blahblahBits functions now instead of blahblahInt.
arch/alpha/arguments.cc:
Renamed readFloatRegInt to readFloatRegBits
arch/alpha/ev5.cc:
Removed the Double from setFloatRegDouble
arch/alpha/registerfile.hh:
Changed the floating point register file from a union of arrays to a class with appropriate accessor functions. The interface is necessary for SPARC.
arch/alpha/types.hh:
Changed the FloatReg type from a union of uint64_t and double to a double, and defined a new type FloatRegBits which is a uint64_t and is used to return the bits which compose a floating point register rather than the value of the register.
arch/isa_parser.py:
Adjusted the makeRead and makeWrite functions to generate the new versions of readFloatReg and setFloatReg.
base/remote_gdb.cc:
kern/tru64/tru64.hh:
Replaced setFloatRegInt with setFloatRegBits
cpu/cpu_exec_context.cc:
Removed the duplicated code for setting the floating point registers, and renamed the function to setFloatRegBits and readFloatRegBits.
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/o3/alpha_cpu_impl.hh:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/cpu.cc:
cpu/o3/cpu.hh:
cpu/o3/regfile.hh:
cpu/ozone/cpu.hh:
cpu/simple/cpu.hh:
Implemented the new versions of the floating point read and set functions.
cpu/simple/cpu.cc:
Replaced setFloatRegDouble with setFloatReg
--HG--
extra : convert_revision :
3dad06224723137f6033c335fb8f6395636767f2
Kevin Lim [Mon, 13 Mar 2006 22:04:24 +0000 (17:04 -0500)]
Have a copyRegs function defined in the ISA that copies registers from one ExecContext to another ExecContext. This makes it easier for anything that needs to copy architected registers to do so in an ISA independent fashion.
arch/alpha/ev5.cc:
copyIprs now copies from a source ExecContext to a destination ExecContext.
arch/alpha/registerfile.hh:
Have ISA specific functions to copy all architected registers from one ExecContext to another.
cpu/cpu_exec_context.cc:
Call the ISA in order to copy any architected registers.
--HG--
extra : convert_revision :
056cc3b3a9f345535d5a57c6524b114bbd5ae3c8
Steve Reinhardt [Sun, 12 Mar 2006 22:24:02 +0000 (17:24 -0500)]
Add simple eio-based test.
--HG--
extra : convert_revision :
969e8fddad1b87eaa294857945a4c46cb175984d
Steve Reinhardt [Sun, 12 Mar 2006 22:23:18 +0000 (17:23 -0500)]
Oops, this goes with the previous changeset!
mem/mem_object.hh:
Change getPort() to be anonymous by default.
--HG--
extra : convert_revision :
6998885ddccfbf26bc470112f40c3f19913ba7e2
Steve Reinhardt [Sun, 12 Mar 2006 22:21:59 +0000 (17:21 -0500)]
Replace Memory with MemObject; no need for two different levels of hierarchy there.
Get rid of addPort().
Change getPort() behavior on PhysicalMemory.
SConscript:
cpu/simple/cpu.hh:
sim/system.cc:
sim/system.hh:
Replace Memory with MemObject.
cpu/base.hh:
No need to declare Port here anymore.
cpu/cpu_exec_context.hh:
Need PageTable definition.
cpu/simple/cpu.cc:
mem/physical.cc:
mem/physical.hh:
Replace Memory with MemObject.
Get rid of addPort(); allow getting anonymous ports with getPort().
mem/translating_port.hh:
Remove unneeded header.
sim/process.cc:
Replace Memory with MemObject.
Change how initialization port gets set up to deal with change in
addPort()/getPort(). Current solution is not ideal but it works.
sim/process.hh:
Remove unneeded headers and declarations.
Make LiveProcess::getDesc() abstract instead of panicing if called.
sim/syscall_emul.hh:
Fix includes.
--HG--
extra : convert_revision :
11d4ffb54230038afcf7219cc46e51f809329a2f
Steve Reinhardt [Sun, 12 Mar 2006 21:38:16 +0000 (16:38 -0500)]
Get rid of "Functional" suffix from (read|write)(Blob|String) functions.
--HG--
extra : convert_revision :
1456308af0fd686dff53ec1baddd7747354e1c0a
Steve Reinhardt [Sun, 12 Mar 2006 21:27:52 +0000 (16:27 -0500)]
Clean up arch/*/process.hh includes and std namespace issues.
arch/alpha/process.cc:
arch/mips/process.cc:
arch/sparc/process.cc:
You really do need the headers in the .cc file.
arch/alpha/process.hh:
Don't include unnecessary headers in another header.
Replace with forward class declarations.
arch/mips/process.hh:
arch/sparc/process.hh:
Don't include unnecessary headers in another header.
Replace with forward class declarations.
Also fix std namespace... no "using" in header files!
--HG--
extra : convert_revision :
f2cd953d0f4a212bb8148cc54c329aa3c18deb89
Steve Reinhardt [Sun, 12 Mar 2006 21:11:41 +0000 (16:11 -0500)]
More memory system cleanup:
- Get rid of unused ProxyMemory class (replaced by TranslatingPort).
- Get rid of remaining unused prot_* functions.
mem/physical.cc:
mem/physical.hh:
mem/port.hh:
Get rid of remaining unused prot_* functions.
--HG--
extra : convert_revision :
f16c208f4e4c38bd6bb3626339674c9278da9e07
Steve Reinhardt [Sun, 12 Mar 2006 21:03:46 +0000 (16:03 -0500)]
Fix bk ignore paths for new build options directory structure.
--HG--
extra : convert_revision :
daf67203a26c8139f810cc4e8d16e652373f305b
Steve Reinhardt [Sun, 12 Mar 2006 21:01:41 +0000 (16:01 -0500)]
Get rid of validInstAddr() & validDataAddr().
SE mode can now use page tables to determine which addresses are valid.
sim/process.cc:
sim/process.hh:
Get rid of validInstAddr() & validDataAddr().
SE mode can now use page tables to determine which addresses are valid.
Also get rid of some Process object fields that were only used by those functions.
--HG--
extra : convert_revision :
74a25c0c2453bfc598eedacdbfccea1cf6493ba6
Steve Reinhardt [Sun, 12 Mar 2006 20:51:48 +0000 (15:51 -0500)]
Add "using namespace TheISA" to syscall emulation functions so they pick up the right definitions of htog/gtoh etc.
--HG--
extra : convert_revision :
7ee949a2151f9a8d158815a7dffba6c19779f282
Steve Reinhardt [Sun, 12 Mar 2006 20:14:07 +0000 (15:14 -0500)]
Clean up "using" declarations.
arch/alpha/isa_traits.hh:
No unprotected "using" in header files.
cpu/simple/cpu.cc:
Fix ISA namespace "using" statement.
--HG--
extra : convert_revision :
317ea40f8de00748d7613a0116edab05770bdc72
Korey Sewell [Sun, 12 Mar 2006 10:58:28 +0000 (05:58 -0500)]
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem
--HG--
extra : convert_revision :
b101fa550567d5a9f5de6c2d8c3f67829ae050c1
Korey Sewell [Sun, 12 Mar 2006 10:57:34 +0000 (05:57 -0500)]
MIPS is back to compiling and building now!
arch/alpha/isa_traits.hh:
used for SimpleCPU instead of explicitly calling the namespace we declare in isa_traits.hhs
so other archs. can use SimpleCPU
arch/mips/SConscript:
dont include common_syscall or tru64
arch/mips/faults.cc:
arch/mips/faults.hh:
arch/mips/isa/formats/unimp.isa:
arch/mips/isa/formats/unknown.isa:
Change Faults to new format
arch/mips/isa/decoder.isa:
Fix readMiscReg access
Made change so that you cant explicitly tell if a instruction nop,ehb,or ssnop... These are all variants
of the sll instruction so I may need to make a separte class of instructions to handle thse better
arch/mips/isa/includes.isa:
add isa_traits.hh and MipsISA included into every auto-gen file
arch/mips/isa_traits.cc:
create copyMiscRegs function...
delete useless code
arch/mips/isa_traits.hh:
clean up for build
arch/mips/linux_process.cc:
mem is now getMemPort(), linux process objects now take in a system argument
arch/mips/linux_process.hh:
new argument for linux process
arch/mips/process.cc:
add system
arch/mips/process.hh:
add system variable
cpu/cpu_exec_context.cc:
Change AlphaISA to TheISA
cpu/exec_context.hh:
add readNextNPC and setNextNPC functions
cpu/simple/cpu.cc:
include isa_traits for namespace declariation
cpu/simple/cpu.hh:
PC & NPC access/modify functions
arch/mips/utility.hh:
file needed for compile
--HG--
extra : convert_revision :
29a327e79c51c6174a6e526aa68c7aab7e7eb535
Steve Reinhardt [Sun, 12 Mar 2006 06:07:58 +0000 (01:07 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision :
a784e60b7f79d70b09052fc4a8ae35a821d307dc
Steve Reinhardt [Sun, 12 Mar 2006 06:05:01 +0000 (01:05 -0500)]
Get rid of obsolete header that had only one declaration of
an obsolete function that doesn't exist.
arch/alpha/tru64/process.cc:
sim/process.cc:
Don't include useless header.
--HG--
extra : convert_revision :
1dd5edeb0703e2190b89ea5ff563df4c95b7cf59
Steve Reinhardt [Sun, 12 Mar 2006 05:40:29 +0000 (00:40 -0500)]
Fix TranslatingPort access functions to:
- know nothing about Fault objects (as it should be)
- call fatal() by default on accesses to unmapped addrs
- provide "try" versions for callers that are prepared to handle failure
mem/translating_port.cc:
mem/translating_port.hh:
Memory system objects should not return Fault objects, just errors.
Half the time we don't check the return code anyway, so make
default version of the access functions call fatal().
Provide "try*" versions that return a bool for places where we
really are going to check the return code.
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Need to use new "tryReadString" here since we actually check the return code.
--HG--
extra : convert_revision :
039737398ef183904dc382c05912ab96cd1d4a51
Steve Reinhardt [Sun, 12 Mar 2006 05:34:02 +0000 (00:34 -0500)]
Minor fix to fault message in SimpleCPU.
cpu/simple/cpu.cc:
Fix up fault message... 0x prefix is redundant when using %p.
--HG--
extra : convert_revision :
329d4417287a036a0f24544f73f48c0e19059425
Steve Reinhardt [Sun, 12 Mar 2006 05:30:55 +0000 (00:30 -0500)]
Fix EIO handling for new memory system.
SConscript:
Compile in eio.cc again.
--HG--
extra : convert_revision :
a40f251d6b400fce61f91a9cb1cdae3ca21df4a7
Steve Reinhardt [Sun, 12 Mar 2006 03:02:34 +0000 (22:02 -0500)]
Tweak exit() message.
sim/syscall_emul.cc:
Make message for exit() more obvious.
--HG--
extra : convert_revision :
5cf7ddb19761e8ff071635368ea77c24d8857c7e
Steve Reinhardt [Sun, 12 Mar 2006 03:01:33 +0000 (22:01 -0500)]
Bump up NFS wait time in qdo (since this has been causing
problems in pool regressions).
util/qdo:
Bump up hardcoded NFS wait time from 45 sec to 90 sec (and
print threshold from 10 sec to 30 sec). Would be even
nicer to make these cmd-line params, but nobody would use
them anyway.
--HG--
extra : convert_revision :
1e9b3ad43a5dbf5e30758069e5a8cde3749cc1a6
Gabe Black [Sat, 11 Mar 2006 19:26:34 +0000 (14:26 -0500)]
Added registerfile.hh and utility.hh
--HG--
extra : convert_revision :
f825fcf53e716efc62e541692cb4ed26366abc26
Gabe Black [Sat, 11 Mar 2006 00:11:27 +0000 (19:11 -0500)]
Work towards factoring isa_traits.hh into smaller, more specialized files.
arch/SConscript:
Sorted the switch headers, and added registerfile.hh, constants.hh, types.hh, and utility.hh.
arch/alpha/isa_traits.hh:
Moved the register file types to registerfile.hh, small functions to utility.hh, and cleaned out alot of stuff that isn't necessary anymore.
base/loader/ecoff_object.cc:
base/loader/elf_object.cc:
cpu/pc_event.hh:
cpu/static_inst.hh:
mem/port.hh:
sim/faults.cc:
sim/system.hh:
base/misc.hh isn't included through isa_traits.hh anymore.
cpu/simple/cpu.cc:
Added include for arch/utility.hh
--HG--
extra : convert_revision :
24f65f330f87e3c909c939596cfcf48336022eaf
Gabe Black [Fri, 10 Mar 2006 23:26:12 +0000 (18:26 -0500)]
Moved MaxAddr.
sim/host.hh:
Moved MaxAddr from arch to here, since it depends only on the Addr type.
--HG--
extra : convert_revision :
e5eaa0bfbe2a376b0d309c517687b3d9d63e407f
Gabe Black [Fri, 10 Mar 2006 23:20:14 +0000 (18:20 -0500)]
Got rid of some dead code.
--HG--
extra : convert_revision :
591312f1e57953a3b03639cef1a3ff6bd08f5f67
Gabe Black [Fri, 10 Mar 2006 23:18:18 +0000 (18:18 -0500)]
Moved some constants into constants.hh
--HG--
extra : convert_revision :
aeb0242b9f3c24c2ff0623bbc31a2373d52b875f
Gabe Black [Fri, 10 Mar 2006 23:03:00 +0000 (18:03 -0500)]
Got rid of unnecessary fault_addr function.
--HG--
extra : convert_revision :
ff265b76cb5110736e67d1779e5d100a607da70e
Gabe Black [Fri, 10 Mar 2006 23:00:25 +0000 (18:00 -0500)]
Got rid of forward declaration of RegFile and MiscRegFile, since they aren't necessary anymore.
--HG--
extra : convert_revision :
faf5bba3720204fe399778ffaae72f9845b3baff
Gabe Black [Fri, 10 Mar 2006 22:57:44 +0000 (17:57 -0500)]
Pushed the InternalProcReg type into the MiscRegFile, so it's not needed here any more.
--HG--
extra : convert_revision :
443ae3fe4d7ac99ef5cbd1366266604bb13761c3
Gabe Black [Fri, 10 Mar 2006 22:56:41 +0000 (17:56 -0500)]
Added ev5.hh to files which should include it directly, now that it isn't included within isa_traits.hh
--HG--
extra : convert_revision :
e49935da238a299e681f9137ad3c0b7dc0e226a3
Gabe Black [Fri, 10 Mar 2006 22:55:47 +0000 (17:55 -0500)]
Moved constants from isa_traits.hh into constants.hh.
arch/alpha/isa_traits.hh:
Moved constants from isa_traits.hh into constants.hh. Also removed the dependence on ev5.hh
--HG--
extra : convert_revision :
f7a03c4ffb1394dcca5a5a96da468c3ff14e1974
Gabe Black [Fri, 10 Mar 2006 22:01:58 +0000 (17:01 -0500)]
Merge m5.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmem
--HG--
extra : convert_revision :
58a5ae14fc8ac697206a3bfa1cf543a3579123d4
Ron Dreslinski [Fri, 10 Mar 2006 21:59:02 +0000 (16:59 -0500)]
It now runs hello world binary.
Fixed the exec context proxy class to have a getMemPort function.
arch/alpha/linux/process.cc:
arch/alpha/tru64/process.cc:
kern/tru64/tru64.hh:
sim/syscall_emul.cc:
sim/syscall_emul.hh:
Fix to use new exec context proxy
--HG--
extra : convert_revision :
eaa05dfab3fdb77627f6cf404a2569a44232f604
Ron Dreslinski [Fri, 10 Mar 2006 21:51:52 +0000 (16:51 -0500)]
Add getMemPort to exec context proxy
--HG--
extra : convert_revision :
a28c0410a63745b7455ad957c582c38319901cf0
Gabe Black [Fri, 10 Mar 2006 21:47:00 +0000 (16:47 -0500)]
Put the InternalProcReg type into the MiscRegFile, which is the only place it's used.
--HG--
extra : convert_revision :
e5a942c2fbf951dc13a5aee9d2ac85982ff3e9c9
Gabe Black [Fri, 10 Mar 2006 21:37:22 +0000 (16:37 -0500)]
Split out basic types from isa_traits.hh into a new file, types.hh
arch/alpha/isa_traits.hh:
Pulled out basic type definitions into types.hh
arch/alpha/types.hh:
New BitKeeper file ``arch/alpha/types.hh''
For relatively basic types associated with an architecture. This does not include, for instance, register files.
--HG--
extra : convert_revision :
ee6c4afc115271ad237208274c863a7dee97c5d7
Gabe Black [Fri, 10 Mar 2006 21:26:31 +0000 (16:26 -0500)]
Eliminated TARGET_ALPHA, since THE_ISA provides the same function.
--HG--
extra : convert_revision :
eb173a553b0782891e8b4a8e227bfb647390883a
Gabe Black [Fri, 10 Mar 2006 20:12:46 +0000 (15:12 -0500)]
Wrapped setSysCallReturn in !FULL_SYSTEM.
--HG--
extra : convert_revision :
c6d3a5af04731a92eaca2337424ba10926f0d879
Steve Reinhardt [Fri, 10 Mar 2006 15:01:29 +0000 (10:01 -0500)]
Compiles now (with CPU_MODELS=SimpleCPU), but hangs
on execution.
configs/test/test.py:
Move test binary out of m5-test, don't depend on
m5-test/Benchmarks.
python/m5/objects/System.py:
Split out full-system-only parameters (lost in merge).
sim/system.cc:
Need to be able to instantiate System directly in SE mode
(lost in merge).
sim/system.hh:
A few more functions here are FS-only.
configs/test/hello:
Add in binary.
--HG--
rename : configs/test.py => configs/test/test.py
extra : convert_revision :
4051b18772e0a0dcb97eb591d4373683be9f4395
Gabe Black [Fri, 10 Mar 2006 00:21:35 +0000 (19:21 -0500)]
SimpleCPU compiles with merge.
arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/alpha/process.cc:
arch/alpha/process.hh:
arch/alpha/tru64/process.cc:
base/chunk_generator.hh:
base/loader/elf_object.cc:
cpu/cpu_exec_context.cc:
cpu/cpu_exec_context.hh:
cpu/exec_context.hh:
cpu/simple/cpu.cc:
kern/linux/linux.hh:
kern/tru64/tru64.hh:
mem/packet.hh:
mem/page_table.cc:
mem/page_table.hh:
mem/physical.cc:
mem/request.hh:
mem/translating_port.cc:
sim/process.hh:
sim/system.cc:
Fixing merged changes.
--HG--
extra : convert_revision :
2e94f21009395db654880fcb94ec806b6f5772c3
Gabe Black [Thu, 9 Mar 2006 23:35:28 +0000 (18:35 -0500)]
Hand merge. Stuff probably doesn't compile.
--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
7d1efcedd708815d985a951f6f010fbd83dc27e8
Ali Saidi [Thu, 9 Mar 2006 21:17:10 +0000 (16:17 -0500)]
fix merging issues
arch/alpha/isa_traits.hh:
arch/sparc/linux/process.cc:
fix merging problem
sim/syscall_emul.cc:
use setIntReg
--HG--
extra : convert_revision :
e88d72e415493cd17d7b88c22c7e995f3199e396
Ali Saidi [Thu, 9 Mar 2006 20:56:42 +0000 (15:56 -0500)]
Merge zizzer:/bk/multiarch
into zeep.eecs.umich.edu:/z/saidi/work/m5.ma2
arch/alpha/isa_traits.hh:
arch/alpha/linux/process.cc:
arch/sparc/isa_traits.hh:
arch/sparc/linux/process.cc:
sim/process.cc:
merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
fea0155c8e23abbd0d5d5251abbd0f4d223fe935
Ali Saidi [Thu, 9 Mar 2006 20:42:09 +0000 (15:42 -0500)]
no more common syscall emulation, now common for everyone
check abi-tag note section of elf binary for OS
add pseudo functions (moved from alpha and made to be generic)
move setsyscallreturn into isa traits
arch/alpha/SConscript:
no more common syscall emulation, now common for everyone
arch/alpha/isa_traits.hh:
move setsyscallreturn into isa description
arch/alpha/linux/process.cc:
arch/alpha/tru64/process.cc:
use generic functions rather than alpha specific ones
arch/sparc/isa_traits.hh:
have consts for generic pseudo syscalls
arch/sparc/linux/process.cc:
use generic functions
base/loader/elf_object.cc:
check abi-tag note section of elf binary for OS
cpu/exec_context.hh:
move syssyscallreturn into isa traits
sim/process.cc:
find call num with a more generic
sim/syscall_emul.cc:
sim/syscall_emul.hh:
add pseudo functions (moved from alpha and made to be generic)
--HG--
extra : convert_revision :
5a31024ecde7e39b830365ddd84593ea501a34d2
Gabe Black [Thu, 9 Mar 2006 20:15:55 +0000 (15:15 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/z/m5/Bitkeeper/multiarch
cpu/simple/cpu.cc:
Hand Merge
--HG--
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision :
bf664b092f993d0f4675ce8e7df13645a920c1f4
Kevin Lim [Thu, 9 Mar 2006 20:10:55 +0000 (15:10 -0500)]
Use functions to access XC.
cpu/exec_context.hh:
Include readNextNPC function.
cpu/simple/cpu.cc:
Use functions to set and access nextPC, nextNPC.
--HG--
extra : convert_revision :
22622b9c110e1d99cc9106a2a27c479579d7e1ad
Korey Sewell [Thu, 9 Mar 2006 08:27:51 +0000 (03:27 -0500)]
last changes before big merge
arch/alpha/isa_traits.hh:
arch/sparc/isa_traits.hh:
add nnpc for compiling purposes in exec_context setNextNPC function
cpu/exec_context.hh:
set NNPC function
cpu/simple/cpu.cc:
use NNPC in determining what PC we are using
--HG--
extra : convert_revision :
e810cfbc5dc31879b20d2cc40bf9871613203532
Korey Sewell [Thu, 9 Mar 2006 07:34:12 +0000 (02:34 -0500)]
minor comments to decoder.isa
arch/mips/isa/decoder.isa:
comments
--HG--
extra : convert_revision :
8e4fdf36d7f7365cda062bc169a313bf860a4fe5
Korey Sewell [Wed, 8 Mar 2006 21:54:08 +0000 (16:54 -0500)]
Merge zizzer:/bk/multiarch
into zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/multiarch-m5
--HG--
extra : convert_revision :
f3502f293f6ea44b5cf209ce2a935a25bca6054f
Korey Sewell [Wed, 8 Mar 2006 21:53:44 +0000 (16:53 -0500)]
add explicit support for nop,ssnop, and ehb instructions
--HG--
extra : convert_revision :
41151d38cabb6ce0ea81e5d78e4474d8f2ffeb67
Kevin Lim [Wed, 8 Mar 2006 20:10:47 +0000 (15:10 -0500)]
Include ability to copy all misc regs.
arch/alpha/ev5.cc:
Include function for the MiscRegFile to copy all of the Iprs from an ExecContext.
arch/alpha/isa_traits.hh:
Include functions to copy MiscRegs from an ExecContext.
cpu/cpu_exec_context.cc:
Be sure to copy all of the misc regs when copying all architectural state.
--HG--
extra : convert_revision :
cb948b5ff141ea0f739a1016f98236bd2a512f76
Kevin Lim [Wed, 8 Mar 2006 18:26:30 +0000 (13:26 -0500)]
Merge ktlim@zizzer:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5-proxyxc
arch/alpha/ev5.cc:
cpu/o3/cpu.hh:
SCCS merged
--HG--
extra : convert_revision :
38889011ea02005c8fd3a7f3b0be3395223f6166
Kevin Lim [Wed, 8 Mar 2006 16:34:41 +0000 (11:34 -0500)]
Forward declaration of MemoryController.
My change to exec_context.hh probably affected these files to no longer have MemoryController forward declared through a long chain of includes. MemoryController should be forward declared where it is used anyways.
dev/alpha_console.hh:
dev/uart.hh:
dev/uart8250.hh:
Forward declaration of MemoryController.
--HG--
extra : convert_revision :
afaac4014e0eb3b6d5d385cd4444b77511e03b51
Gabe Black [Wed, 8 Mar 2006 13:09:45 +0000 (08:09 -0500)]
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch
--HG--
extra : convert_revision :
5fe5a3d70774d6420b890237d9be4a5d0f00d17e
Gabe Black [Wed, 8 Mar 2006 13:09:27 +0000 (08:09 -0500)]
Working towards compiling SPARC_SE
arch/alpha/isa_traits.hh:
Changed the enums to const ints, and got rid of a few unnecessary constants.
arch/sparc/isa_traits.hh:
Got rid of the enums, and added in some missing constants.
--HG--
extra : convert_revision :
ee47890af9d8c67300b31d8e0dda1d580bd21479
Korey Sewell [Wed, 8 Mar 2006 09:36:55 +0000 (04:36 -0500)]
Update MiscReg enum and miscRegFile definition
update miscReg file access
arch/mips/isa/decoder.isa:
arch/mips/isa_traits.cc:
update miscRegfile access
arch/mips/isa_traits.hh:
Update MiscReg enum and miscRegFile definition
--HG--
extra : convert_revision :
9b6b9343d674e1e38e25bb9a4ffe4325142e7424
Korey Sewell [Wed, 8 Mar 2006 07:05:38 +0000 (02:05 -0500)]
updated MIPS ISA files .... all files should be able to compile/build with MIPS option except isa_traits.*
which I need to update the misc. regfile accesses
arch/mips/faults.cc:
arch/mips/faults.hh:
alpha to mips
arch/mips/isa/base.isa:
add includes
arch/mips/isa/bitfields.isa:
more bitfields
arch/mips/isa/decoder.isa:
lots o' lots o' lots o' changes!!!!
arch/mips/isa/formats.isa:
include cop0.isa
arch/mips/isa/formats/basic.isa:
fix faults
arch/mips/isa/formats/branch.isa:
arch/mips/isa/formats/fp.isa:
arch/mips/isa/formats/int.isa:
arch/mips/isa/formats/mem.isa:
arch/mips/isa/formats/noop.isa:
arch/mips/isa/formats/trap.isa:
arch/mips/isa/formats/unimp.isa:
arch/mips/isa/formats/unknown.isa:
arch/mips/isa/formats/util.isa:
arch/mips/isa/operands.isa:
arch/mips/isa_traits.cc:
arch/mips/linux_process.cc:
merge MIPS-specific comilable/buidable files code into multiarch
arch/mips/isa_traits.hh:
merge MIPS-specific comilable/buidable files code into multiarch... the miscRegs file accesses i have
need to be recoded and everything should build then ...
arch/mips/stacktrace.hh:
file copied over
--HG--
extra : convert_revision :
4a72e14fc5fb0a0d1f8b205dadbbf69636b7fb1f
Kevin Lim [Wed, 8 Mar 2006 04:44:30 +0000 (23:44 -0500)]
Use getProxy() instead of xcProxy; avoids confusion of where xcProxy must be set.
--HG--
extra : convert_revision :
548822baafe73b8041b7030feb1c4550fb80292f