summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-05-15fix typo, headers protection should be named __DIR_DIR_..._FILE_HH__Ali Saidi
--HG-- extra : convert_revision : 18268bfcb8575a33659ae94b821e1f4cc9b7d821
2006-05-09Print M5 build options for 'scons -h'.Steve Reinhardt
--HG-- extra : convert_revision : 14ef62e513987b89e913e2bf9b8771ee086ed0a0
2006-05-07First Steps in cleaning up MIPS code - This changeset rearranges the files ↵Korey Sewell
in the MIPS directory by moving where constants/types/classes are defined arch/mips/SConscript: arch/mips/isa_traits.cc: arch/mips/isa_traits.hh: arch/mips/process.cc: arch/mips/linux/linux.cc: arch/mips/utility.hh: arch/mips/linux/process.cc: arch/mips/int_regfile.hh: arch/mips/misc_regfile.hh: arch/mips/regfile.hh: arch/mips/types.hh: MIPS directory rearranging --HG-- rename : arch/mips/mips_linux.cc => arch/mips/linux/linux.cc rename : arch/mips/mips_linux.hh => arch/mips/linux/linux.hh rename : arch/mips/linux_process.cc => arch/mips/linux/process.cc rename : arch/mips/linux_process.hh => arch/mips/linux/process.hh extra : convert_revision : 138eee48c8ed75efcf38572f335a556aaec38fc7
2006-05-07Minor changes for FP ... MIPS now works for floating-point programs...Korey Sewell
Now we are to the point where more benchmarks and instruction-coverage is necessary to totally verify/validate correct operation across all MIPS instructions arch/mips/isa_traits.hh: fix for reading double values ... must rearrange bits before using void* to read double. configs/test/hello_mips: real hello world MIPS binary --HG-- extra : convert_revision : 153de1f8a830882c6972bd0bdb56da818f614def
2006-05-07Basic MIPS floating point test works now ... I had to realize that when ↵Korey Sewell
using the double FP reg the register with the higher # contains the most significant bytes... arch/mips/isa/decoder.isa: divide instruction fixes arch/mips/isa_traits.cc: use double as argument to cvt & round function. clean up cout statements in function. arch/mips/isa_traits.hh: In MIPS the higher # reg of a doubles pair is ALSO the most significant reg. Once I switched this the basic MIPS FP test I had worked. --HG-- extra : convert_revision : 45c80df229e6174d0b52fc7cfb530642b1f1fc35
2006-05-04take-out debug only codeKorey Sewell
arch/mips/isa/formats/fp.isa: take out debug-only code --HG-- extra : convert_revision : 12c320b4b1432a626acefc496ec7a188c8b3fb66
2006-05-04Merge zizzer:/bk/newmemKorey Sewell
into zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem --HG-- extra : convert_revision : c48a8857f5a520ff8061eb3d8f08dcd43661e68c
2006-05-04recognized 32 & 64 bit unsigned integer types and set the width appropriatelyKorey Sewell
arch/mips/isa_traits.hh: debug statements to be taken out real soon like... --HG-- extra : convert_revision : 4e9abcb99c991db93328d01d7606a2bb942b29ee
2006-05-02Redo the FloatRegFile using unsigned integersKorey Sewell
Edit the convert_and_round function which access FloatRegFile arch/isa_parser.py: recognize when we are writing a 'uint64_t' FloatReg and set the width appropriately arch/mips/isa/decoder.isa: Send a 'float' to the convert function instead of a unsigned word. Do this so we dont have to worry about the bit manipulation ourselves. We can just concern ourselves with values. Use unsigned double to get movd... arch/mips/isa/formats/fp.isa: float debug statement arch/mips/isa_traits.cc: add different versions of convert_and_round functions arch/mips/isa_traits.hh: Use an array of uint32_t unsigned integers to represent the Floating Point Regfile configs/test/hello_mips: basic FP program cpu/simple/cpu.hh: spacing --HG-- extra : convert_revision : a6fca91ad6365c83025f1131d71fa1b8ee76d7bc
2006-05-01move code from packet.hh to packet.cc and packet_impl.hhAli Saidi
fix very annoying not-compiler bug arch/sparc/regfile.hh: You have not included an out-of-class definition of your static members. See [9.4.2]/4 and about a billion gcc bug reports. If statements get around the problem through some magic, and than seems nicer that putting a definition of them in a c file somewhere. cpu/simple/cpu.cc: get() and set() do the conversion now dev/io_device.hh: need get() and set() defentions in all the devices mem/packet.cc: mem/packet.hh: move code from packet.hh to packet.cc mem/physical.cc: packet_impl needed for templated packet functions --HG-- extra : convert_revision : 6c11842aa928d9af7b4cabe826306fe1fe09e693
2006-04-30Got hello world to work!Gabe Black
arch/sparc/isa/decoder.isa: Made sure if a register was assigned to along some control path, then all paths on which no exception would block commit set a value as well. Also, Rs1 is treated as signed for bpr instructions. arch/sparc/isa/formats/integerop.isa: Added an IntOpImm11 class which sign extends the SIMM11 immediate field. arch/sparc/isa/formats/mem.isa: Fixed how offsets are used, and how disassembly is generated. arch/sparc/linux/process.cc: Added fstat and exit_group syscalls. --HG-- extra : convert_revision : 3b4427d239d254a92179a4137441125b8a364264
2006-04-29fixes for seAli Saidi
mem/packet.cc: mem/port.hh: fix for se compilation --HG-- extra : convert_revision : ac960e295f6b51875898245fb55383a59b06cac6
2006-04-28Merge zizzer:/bk/newmemAli Saidi
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : d6f7c4dd146613eeba39249f2d916a77108bc8c1
2006-04-28don't need BusBridge.py anymoreAli Saidi
--HG-- extra : convert_revision : 9ec26ee61d4bc68f1dcd1a8ac162c9519b8e6fde
2006-04-28random mix of tidbitsAli Saidi
configs/test/fs.py: update fs.py to use a bus bridge cpu/simple/cpu.hh: cpu should just return that it doesn't snoop any address ranges python/m5/objects/System.py: move boot_osflags to system --HG-- extra : convert_revision : b4256df7eada7e65b69513361de8bffc3fdd680b
2006-04-28devices should increment pkt.time instead of assiging to itAli Saidi
--HG-- extra : convert_revision : b4ca3c7fc13bf0856eb2a800a11d5611b473ec3e
2006-04-28add a bridge object, modify bus object to be able to connect to other buses ↵Ali Saidi
or bridges without panicing SConscript: add new cc files to scons mem/bus.cc: mem/bus.hh: implement addressRanges() on the bus. propigate address ranges to anyone who is interested stripping out ranges of who your propigating to (to avoid livelock) mem/packet.hh: add intersect function that returns true if two packets touch at least one byte of the same data (for functional access) add fixPacket() that will eventually take the correct action giving a timing and functional packet, right now it panics mem/physical.cc: Don't panic if the physical memory recieves a status change, just ignore. --HG-- extra : convert_revision : d470d51f2fb1db2700ad271e09792315ef33ba01
2006-04-28Add SparcSystem objectAli Saidi
arch/alpha/system.hh: sim/system.hh: make boot_osflags apply to all systems --HG-- extra : convert_revision : 48cf903fd92be250b86817210951b85fa5e74632
2006-04-28Fixed constants to work on 32 bit hostsGabe Black
--HG-- extra : convert_revision : acc8e6f60cfdca518fa45afef4165395cba23d4f
2006-04-28Merge m5.eecs.umich.edu:/bk/newmemGabe Black
into ewok.(none):/home/gblack/m5/newmem cpu/simple/cpu.cc: Hand merged --HG-- extra : convert_revision : 68414730c23d41c30cfb7bcfa604029a5fc8622c
2006-04-28Added byteswapping codeGabe Black
--HG-- extra : convert_revision : 67bf0689399328a728a0f3130d58d483e5f2f06e
2006-04-28Improved the initial stack frameGabe Black
arch/sparc/isa/formats/mem.isa: Added some debugging output --HG-- extra : convert_revision : cea88e2b3eddfa4e60bbbcb02f459d274d80db2e
2006-04-28Added an include which was forgottenGabe Black
--HG-- extra : convert_revision : ad76ab45358787edddb89910049bac7cca288824
2006-04-28Fixed up some syscallsGabe Black
--HG-- extra : convert_revision : f9a32e14fa4d4d4710df83dbf54cb77482ba5d03
2006-04-28Changed the hello_sparc executable back to the cross compiled oneGabe Black
--HG-- extra : convert_revision : 565f75f76dd26ca0e25de4c89d1597a9f39483fd
2006-04-28Some debugging of the ccr bitsGabe Black
--HG-- extra : convert_revision : b3d100b2e34dcecc3ba33c9ad4b0b7e40c210ecc
2006-04-28Added in handling of the annul bit for branches, and fixed up computation of ↵Gabe Black
ccr bits. --HG-- extra : convert_revision : ed38d26e13d25e21819dd32d159f1ee4ffcc780b
2006-04-28Added a linux.cc file to mesh with Korey's changesGabe Black
--HG-- extra : convert_revision : 2073c1cda4799a60fce917f227018dd2e52456a3
2006-04-28More Modest Changes for FP MIPS execution...Korey Sewell
arch/mips/isa/decoder.isa: Fix Reg. Operands for FP Conversion Instructions - Must Make Sure That You use 'uw' or 'ud' as needed. arch/mips/isa_traits.cc: if a conversion function isnt implemented yet, than have M5 panic... (plan to implement SINGLE_TO_DOUBLE first) --HG-- extra : convert_revision : 6a7f703a5d65139d3981a8753c31fc8f5bf313cf
2006-04-28Use lower two bits of FCSR reg to determine rounding mode (may want to move ↵Korey Sewell
this out of decoder.isa and into a template) Have FP conversion instructions use re-defined convert_and_round() function arch/mips/isa/decoder.isa: Use lower two bits of FCSR reg to determine rounding mode (may want to move this out of decoder.isa and into a template) Have FP conversion instructions to use re-defined convert_and_round() function arch/mips/isa/formats/util.isa: Remove convert_and_round function from here arch/mips/isa_traits.cc: Define convert_and_round function here arch/mips/isa_traits.hh: Use "enums" to define FP conversion types & Round Modes Declare convert_and_round function here --HG-- extra : convert_revision : 0f4f8c1732a53b277361559ea71af2a1feb4fc64
2006-04-27change readPC() + 4 to readNextPC() and the same for NNPC ...Korey Sewell
arch/mips/isa/decoder.isa: remove useless cout statements arch/mips/isa_traits.hh: space --HG-- extra : convert_revision : 8b8cf5df6fc3eb92598360343eb887c35cda202d
2006-04-27Rewrite CFC1 & CTC1 instruction definitionsKorey Sewell
Use Load/Store Float Memory Formats for FP mem insts Fix Load/Store into FP to not create a "nop" if it sees reg 0 at the defintion arch/mips/isa/decoder.isa: Rewrite CFC1 & CTC1 instruction definitions Use Load/Store Float Memory Formats for FP mem insts arch/mips/isa/formats/fp.isa: comment changes arch/mips/isa/formats/mem.isa: Fix Load/Store Float Memory Formats --HG-- extra : convert_revision : ef1cb7a78452f8dff044b05c89e61bec866bf1b7
2006-04-26Changes to get Floating Point Instructions w/new regfile to at least not ↵Korey Sewell
segfault and break my INT tests arch/mips/isa/decoder.isa: Change decoder to read COP1 (floating point) instructions to decode correctly arch/mips/isa_traits.hh: Change to use overlapping single/double FP regfile --HG-- extra : convert_revision : 2d15d6d88939f7e0d63279d5c35d7eea536a573c
2006-04-24Mostly done with all device models for new memory system. Still need to get ↵Ali Saidi
timing packets working and get sinic working after merge from head. Checkpointing may need some work now. Endian-happiness still not complete. SConscript: add all devices back into make file base/inet.hh: dev/etherbus.cc: dev/etherbus.hh: dev/etherdump.cc: dev/etherdump.hh: dev/etherint.hh: dev/etherlink.cc: dev/etherlink.hh: dev/etherpkt.cc: dev/etherpkt.hh: dev/ethertap.cc: dev/ethertap.hh: dev/pktfifo.cc: dev/pktfifo.hh: rename PacketPtr EthPacketPtr so it doesn't conflict with the PacketPtr type in the memory system configs/test/fs.py: add nics to fs.py cpu/cpu_exec_context.cc: remove this check, as it's not valid. We may want to add something else back in to make sure that no one can delete the static virtual ports in the exec context cpu/simple/cpu.cc: cpu/simple/cpu.hh: dev/alpha_console.cc: dev/ide_ctrl.cc: use new methods for accessing packet data dev/ide_disk.cc: add some more dprintfs dev/io_device.cc: delete packets when we are done with them. Update for new packet methods to access data dev/isa_fake.cc: dev/pciconfigall.cc: dev/tsunami_cchip.cc: dev/tsunami_io.cc: dev/tsunami_pchip.cc: dev/uart8250.cc: dev/uart8250.hh: mem/physical.cc: mem/port.cc: dUpdate for new packet methods to access data dev/ns_gige.cc: Update for new memory system dev/ns_gige.hh: python/m5/objects/Ethernet.py: update for new memory system dev/sinic.cc: dev/sinic.hh: Update for new memory system. Untested as need to merge in head because of kernel driver differences between versions mem/packet.hh: Add methods to access data instead of accessing it directly. --HG-- extra : convert_revision : 223f43876afd404e68337270cd9a5e44d0bf553e
2006-04-20make ide disk work for newmemAli Saidi
SConscript: compile ide devices base/chunk_generator.hh: add another parameter to the chuck generator called complete() which returns the number of bytes transfered so far. Very useful for adding to a pointer. configs/test/fs.py: Add ide disk to fs test configuration dev/ide_ctrl.cc: dev/ide_ctrl.hh: dev/ide_disk.cc: dev/ide_disk.hh: dev/io_device.cc: dev/io_device.hh: dev/pciconfigall.cc: dev/pciconfigall.hh: dev/pcidev.cc: dev/pcidev.hh: update for new memory system mem/bus.cc: support devices that return multiple ranges remove old ranges before using new info mem/packet.hh: make senderstate void* per steve's request that we use every construct possible in C++ mem/physical.cc: have memory stamp the packet with the time. mem/physical.hh: actually set the memory latency variable python/m5/objects/Device.py: Add DmaDevice python/m5/objects/Ide.py: Ide disk no longer has a physmem pointer python/m5/objects/Pci.py: update pci device for newmem python/m5/objects/PhysicalMemory.py: add latency parameter for physical memory sim/byteswap.hh: use fast architecture dependent byteswap calls if they exist --HG-- extra : convert_revision : e3cf2e8f61064ad302d94bc22010a00c59f3f793
2006-04-18Merge zizzer:/bk/newmemAli Saidi
into zeep.pool:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : bf142c05ad4880513ee3438e1fdf62070a6049e3
2006-04-18dwarf debugging symbols make gdb much happier than stabs. Use themAli Saidi
and maximum debugging in for debug target. No such thing as -O5 in GCC, so might as well just use -O3 --HG-- extra : convert_revision : f2e02c4f95c57eace010e75e2457193353088308
2006-04-18Merge m5.eecs.umich.edu:/bk/newmemGabe Black
into ewok.(none):/home/gblack/m5/newmem --HG-- extra : convert_revision : 3eb97976caf57e43119a998c31128ca6f163c05b
2006-04-18Changed MIPS and Alpha to pass the syscall number to the syscall functionGabe Black
arch/alpha/isa/decoder.isa: Fixed up Alpha to pass the syscall number directly to the syscall function. arch/mips/isa/decoder.isa: Fixed up MIPS to pass the syscall number directly to the syscall function. arch/mips/isa/operands.isa: Added an R2 operand which is passed to the syscall function as the syscall number to use. --HG-- extra : convert_revision : 066d486cd6a2761b29e413c6d526c268788975f3
2006-04-18Fixes to SPARC syscall emulation mode.Gabe Black
arch/sparc/isa/base.isa: Added a set of abbreviations for the different condition tests. arch/sparc/isa/decoder.isa: Fixes and additions to get syscall emulation closer to working. arch/sparc/isa/formats/branch.isa: Fixed branches so that the immediate version actually uses the immediate value arch/sparc/isa/formats/integerop.isa: Compute the condition codes -before- writing to the state of the machine. arch/sparc/isa/formats/mem.isa: An attempt to fix up the output of the disassembly of loads and stores. arch/sparc/isa/formats/trap.isa: Added code to disassemble a trap instruction. This probably needs to be fixed up so there are immediate and register versions. arch/sparc/isa/operands.isa: Added an R1 operand, and fixed up the numbering arch/sparc/isa_traits.hh: SyscallNumReg is no longer needed, the max number of sources and destinations are fixed up, and the syscall return uses xcc instead of icc. arch/sparc/linux/process.cc: arch/sparc/linux/process.hh: Added a getresuidFunc syscall implementation. This isn't actually used, but I thought it was and will leave it in. arch/sparc/process.cc: arch/sparc/process.hh: Fixed up how the initial stack frame is set up. arch/sparc/regfile.hh: Changed the number of windows from 6 to 32 so we don't have to worry about spill and fill traps for now, and commented out the register file setting itself up. cpu/cpu_exec_context.hh: cpu/exec_context.hh: cpu/simple/cpu.hh: sim/process.cc: sim/process.hh: Changed the syscall mechanism to pass down the syscall number directly. --HG-- extra : convert_revision : 15723b949a0ddb3d24e68c079343b4dba2439f43
2006-04-17change packet: reset() to resetMin() resetAll() which reset the miniumAli Saidi
and the entire packet respectively. --HG-- extra : convert_revision : 70b8bc8a2cf304d4c955d1a997df4a9a8edd4989
2006-04-14Quick fix for the CPU not printing out the right address upon re-execution ↵Kevin Lim
of a load that missed in the cache. Split mem ops will solve this problem in the future. --HG-- extra : convert_revision : 5bb921998aa0408d568030ef544b9905c4038bb2
2006-04-14These fixes now allow all of the 20 mips tests to work properly!Korey Sewell
Floating Point Mips Tests still need to be added, tested, and debugged. arch/mips/isa/decoder.isa: Fix mult and multu instructions. This semantic error causes the problem: <int64> = <int32> * <int32>. Although I was placing the output into a 64-bit integer the multiply was just doing a 32-bit multiply so the solution is to just use the 'sd' & 'ud' operands so that the ISA parser will use the int64_t and uint64_t types in calculation. arch/mips/isa/formats/int.isa: Trace output fix. Don't print first comma unless there is a destination register for sure! --HG-- extra : convert_revision : 2c503dca70b104fed0b58454975f745dd3cc2eee
2006-04-13update Hello World binary for mips... the old one did not have a newlineKorey Sewell
--HG-- extra : convert_revision : f015cac39e42e11b1a56bbd1c5cf07403eb8f2da
2006-04-13Move RLIMIT constants to OS/ISA specific files instead of generic OS ↵Korey Sewell
container classes Update MIPS/Linux constants arch/alpha/linux/linux.hh: move RLIMIT constants to ALPHA/Linux class arch/alpha/tru64/tru64.hh: move RLIMIT constants to ALPHA/Tru64 class arch/mips/mips_linux.hh: update MIPS constants for MIPS/Linux kern/linux/linux.hh: remove RLIMIT constants from generic Linux class... these are now in ISA specific / OS specific classes kern/tru64/tru64.hh: remove RLIMIT constants from generic Tru64 class... these are now in ISA specific / OS specific classes --HG-- extra : convert_revision : 2e2743d73ab18fcd558a5765cb4ef0e9671bd1d7
2006-04-13remove non-needed filesKorey Sewell
--HG-- extra : convert_revision : 6900ff6972e92bb1bcb4736cce948784c6b905e1
2006-04-13Changes that get rid of the OSFlags and derive a new class of this format ↵Korey Sewell
<architecture>-<OS>. This class is derived from the original <OS> class and is used to define information that is both architecure and OS specific (for example, the AlphaLinux class is derived from the Linux class and defined in arch/alpha/linux/linux.hh). SConscript: no need to compile linux.cc and tru64.cc now, since openFlagsTable has been moved arch/alpha/SConscript: compile linux.cc and tru64.cc within alpha arch. arch/alpha/linux/process.cc: template syscall functions on AlphaLinux instead of Linux ... AlphaLinux is derived off of Linux arch/alpha/tru64/process.cc: template syscall functions on AlphaTru64 instead of Linux ... AlphaTru64 is derived off of Linux moved tableFunc syscall function into this file arch/mips/SConscript: compile mips_linux.cc for openFlags table arch/mips/isa_traits.hh: remove constants from here arch/mips/linux_process.cc: template syscall functions on MipsLinux instead of Linux ... MipsLinux is derived off of Linux kern/linux/linux.hh: remove OSFlags kern/tru64/tru64.hh: remove OSFlags def., openFlagTable, and tableFunc ... sim/syscall_emul.hh: go back to using "OS" instead of "OSFlags" arch/alpha/linux/linux.cc: defines openFlagTable arch/alpha/linux/linux.hh: arch/alpha/tru64/tru64.hh: Alpha Linux constants placed here in class derived from Linux class arch/alpha/tru64/tru64.cc: defines openFlagTable for AlphaTru64 arch/mips/mips_linux.cc: MIPS Linux open flag table arch/mips/mips_linux.hh: Mips Linux constants placed here in class derived from Linux class --HG-- extra : convert_revision : e6c1c2c895429c28fd141732e223e897ab19315e
2006-04-12Merge zizzer:/bk/newmemAli Saidi
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem --HG-- extra : convert_revision : 5fc80b28362c4acc4dee576f60296b81aea004f2
2006-04-12fs now gets to the point where it would really like a filesystem.Ali Saidi
Time to make the ide device work arch/alpha/system.cc: write the machine type and rev in the correct place cpu/simple/cpu.cc: reset the packet structure every time it's reused... wow the simple cpu code for talking to memory is getting horrible. dev/alpha_console.cc: move the setAlphaAccess to startup() to make sure that the console binary is loaded dev/tsunami_cchip.cc: dev/tsunami_pchip.cc: dev/uart8250.cc: fix a couple of bugs injected in the newmem fixes mem/bus.cc: More verbose bus tracing mem/packet.hh: Add a constructor to packet to set the result to unknown and a reset method in the case it's being reused mem/vport.hh: don't need are own read/write methods since the base functional port ones call writeBlob readBlob which do the translation for us --HG-- extra : convert_revision : 8d0e2b782bfbf13dc5c59dab1a79a084d2a7da0a
2006-04-12Merge zizzer:/bk/newmemKorey Sewell
into zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-mips --HG-- extra : convert_revision : 4eff6e7ee7a25b8f5fdad7342b195a869cf528d6