summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2004-06-21start towards getting m5 endian compliantAli Saidi
base/inifile.cc: Added mac os support and fixed a bug, on error we need to exit the child process not return base/intmath.hh: gcc on macos wanted a seperate function for the size_t type base/loader/elf_object.cc: I'm not sure why this works under linux because it seems to return the wrong value. base/stats/text.cc: added define/include for mac os x cpu/exec_context.hh: cpu/simple_cpu/simple_cpu.cc: added endian conversion code dev/alpha_console.cc: rather than accessing a charecter array of varying size depending on the access, lets actually do this properly. dev/alpha_console.hh: get rid of now nolonger used consoleData dev/disk_image.cc: We have to byte swap the data is some cases, added function to do that dev/ethertap.cc: added preproc directive for mac os --HG-- extra : convert_revision : 2b5685765cfa2844926d7397f363d2788e3d640a
2004-05-19Remove the uncacheable bit 39 check (needs to be merged in with head treeAndrew Schultz
if Tru64 is to continue to be supported on Turbolaser) and fixed translation of physical addresses by clearing PA<42:35> when the real uncachable bit (43) is set arch/alpha/ev5.hh: Change to support 256 ASNs and seperate VA_SPACE checks for EV5 and EV6 also add support proper translation of uncacheable physical addresses dev/ide_ctrl.cc: Fix to work with real address translation --HG-- extra : convert_revision : aa3d1c284b8271d4763a8da2509c91bbcf83189a
2004-05-18fix the indefinite interrupting of the ethernet device.Lisa Hsu
dev/ns_gige.cc: clear the device interrupts dev/ns_gige_reg.h: Add a new mask --HG-- extra : convert_revision : ce3617315677cbee577ed8893821a8abc5a1a10d
2004-05-18lift FnEvents and and Binning stuff out of LinuxSystem into commonn places ↵Lisa Hsu
with Tru64. kern/linux/linux_system.cc: add binned_fns parameter to System, remove nonLinux events from LinuxSystem, fix ~LinuxSystem() by adding delete of some things that need to be deleted. kern/linux/linux_system.hh: fix header file to go with linux_system.cc, removing nonLinux events and adding binned_fns param. kern/tru64/tru64_system.cc: add somme consistency by having having binned_fns be _binned_fns in the Tru64System arg list. --HG-- extra : convert_revision : b2ec0c1614e185aafa177c220b91d1f6a4fe6876
2004-05-18merge m5 with linux for the event and binning liftingLisa Hsu
--HG-- extra : convert_revision : 09d3678746c2e9a93a9982dc75d5e1ac309cb2fa
2004-05-17Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : 4dae71fe3482737a22745b27c2ca6983191c4a18
2004-05-17lift system-independent binning stuff out of Tru64System into System.Lisa Hsu
kern/tru64/tru64_system.cc: make binned_fns a parameter for System in addition to Tru64System. Do all the fnEvents setting at the System level, since that is system-independent. kern/tru64/tru64_system.hh: deal with FnEvents in the System, and move some fns over to System. sim/system.cc: sim/system.hh: lift binning stuff into System out of Tru64System --HG-- extra : convert_revision : 591dee6f2013f5c43037726c529a00682b5cf82e
2004-05-17Merge zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5Steve Reinhardt
--HG-- extra : convert_revision : 266d03e82a04cca07f669f778ad11907f2f003d2
2004-05-17Significant changes to ISA description to completely factorSteve Reinhardt
out CPU model. ISA description now generates multiple output source files to (in theory) reduce compilation time. arch/alpha/isa_desc: Update for parser changes. Move most constructors out of class declarations (which are now in decoder.hh) and into decoder.cc. Move all execute() methods into exec output. arch/isa_parser.py: Significant changes to make ISA description completely independent of CPU model, and isolate model-dependent parts of parser into one little class (CpuModel). Also split up code output into multiple files (a header, a main source file, and per-cpu execute() method files). Noticeable changes to language as a result. See updated Doxygen documentation. cpu/simple_cpu/simple_cpu.hh: SimpleCPUExecContext typedef no longer needed. Add forward declaration of Process. cpu/static_inst.hh: SimpleCPUExecContext and FullCPUExecContext typedefs no longer needed. Make eaCompInst() and memAccInst() return const refs. --HG-- extra : convert_revision : 71471f267804fafd0a881bac7445677e76334daf
2004-05-17push the new system_events file that i was prevented from pushing way back ↵Lisa Hsu
when cable died. :(. also, fix the printing of binned stats, it was printing hex values instead of bin names. base/stats/text.cc: fix the printing of binned stats. --HG-- extra : convert_revision : 3a04d004f5ea1d90536f7102fce946fd6dd34613
2004-05-17Changes to let system boot with COW imageAndrew Schultz
--HG-- extra : convert_revision : f98f05834c2d3dc07448b17596247f17e7b73cfd
2004-05-17Merge zizzer.eecs.umich.edu:/bk/m5Lisa Hsu
into shizzle.(none):/home/hsul/work/m5 --HG-- extra : convert_revision : fb775c1ed5ac9712929bbd7186b9ab13e90e2dc1
2004-05-16Now that the generation stuff is working, make the gendirNathan Binkert
work correctly. --HG-- extra : convert_revision : 08a5147f5a5cac46800eeef47b4a23451a1139c2
2004-05-16Make the build process deal with the target arch directoryNathan Binkert
and generated files a bit better. --HG-- extra : convert_revision : e2216289bb53fd231e228c2d9d740317c00991bb
2004-05-14manual merge of linux_system and makefileAli Saidi
kern/linux/linux_system.cc: merged --HG-- extra : convert_revision : 81ef6a46f76968985f44c72f296a79ea77e73d12
2004-05-14Linux boots... various fixes to make console work correctlyAli Saidi
dev/console.cc: commented out code that checks if an interrupt is happening before issuing one because they can get lost when linux boots dev/console.hh: added a setPlatform function to set the platform to interrupt dev/platform.hh: dev/tsunami.cc: dev/tsunami.hh: Added virtual functions to post console interrupts dev/tsunami_io.cc: allowed a 64bit read of the PIC since we can't do a physical byte read dev/tsunami_uart.cc: moved TsunamiUart to PioDevice various little fixes to make linux work dev/tsunami_uart.hh: Made Tsunami_Uart a PIO device dev/tsunamireg.h: added some UART defines and used the ULL macros kern/linux/linux_system.cc: commented out waiting for gdb --HG-- extra : convert_revision : 8cfd0700f3812ab349a6d7f132f85f4f421c5c5e
2004-05-13Merge zizzer.eecs.umich.edu:/bk/m5Lisa Hsu
into shizzle.(none):/home/hsul/work/m5 --HG-- extra : convert_revision : e47c4db52bdf074b596591f145ffb1a6443d63a4
2004-05-13lift some things out of the tru64 directory into common directory so linux ↵Lisa Hsu
can use it without replication later. kern/tru64/tru64_events.cc: kern/tru64/tru64_events.hh: lift out SkipFuncEvent and FnEvents since these can be used by any OS. kern/tru64/tru64_system.cc: add system_events (the common OS events file) --HG-- extra : convert_revision : 4d7a843d67459af4d77e433ae3c1b0fbc5f0b56b
2004-05-13Add VPtr class that makes it possible to esentially createNathan Binkert
a pointer to an object that lives inside simulated memory. Useful for doing a bit of analysis of what's going on in the running kernel. --HG-- extra : convert_revision : d78089cce5ec4334483a710ba512eaf18d9b0319
2004-05-13remove the annotation junkNathan Binkert
arch/alpha/isa_desc: remove the annotation junk Move some code to AlphaPseudo where it belongs arch/alpha/pseudo_inst.cc: arch/alpha/pseudo_inst.hh: remove the annotation junk add pseudo instruction code that was previously misplaced --HG-- extra : convert_revision : 97db8402aa34e0bdf044b138c52331fc9e714986
2004-05-13pass the address of both the old an new pcbb on contextNathan Binkert
switches. (Makes other uncommitted code easier to merge.) arch/alpha/ev5.cc: pass the address of both the old an new pcbb on context switches --HG-- extra : convert_revision : bff8c8d1b532ad5f9af6270169bbfb1b5c05256a
2004-05-13wrap mbuf stuff in the tru64 namespace since other OSesNathan Binkert
may be different --HG-- extra : convert_revision : 75ea218b5219c7a2b5bf7dca7c52dfff22740478
2004-05-13Avoid sending a signal to ourselves if we're not debuggingNathan Binkert
--HG-- extra : convert_revision : d6ba1ce30bad4a44d716238a8107c3bff0ce89c4
2004-05-12Fixes to DMA writing (still unverified) and added serialize/unserializeAndrew Schultz
dev/ide_ctrl.cc: Added serialize/unserialize functions and move some inlined functions to regular functions dev/ide_ctrl.hh: Change inlined functions to regular functions dev/ide_disk.cc: Changes to dmaWrite and also add serialize/unserialize functions dev/ide_disk.hh: Support for serializing/unserializing --HG-- extra : convert_revision : 40e016dc7f6637b033fe33409338437c985a05f4
2004-05-12Make a new stat type of Value which is a scalar stat thatNathan Binkert
proxies for a real C/C++ scalar value or scalar functor. This replaces the scalar() and functor() terms that were previously used in formulas. This helps when dumping statistics because the formulas are not supposed to change. cpu/base_cpu.cc: Add a number of cycles stat to the cpu object that tracks the number of cycles that the cpu has executed. This starts to pave the way for cpu cycles being different from event ticks. cpu/base_cpu.hh: provide a functor for calculating all simulated instructions of all CPUs and a virtual function for determining that number. To deal with the change from functor() to Value::functor() cpu/simple_cpu/simple_cpu.cc: simTicks -> numCycles numInsts is now a real Scalar stat, not a Formula cpu/simple_cpu/simple_cpu.hh: numInsts is now a real Scalar stat, not a Formula count all instructions sim/stat_control.cc: simInsts, simTicks, hostMemory, and hostSeconds are no longer Statistics::Formula but rather Statistics::Value add new stat for tick frequency sim/stats.hh: don't need everything to be extern. test/Makefile: Make stuff work a tad bit better test/stattest.cc: test out Statistics::Value --HG-- extra : convert_revision : c812e8baa2b17c08abf3a68ed1e1125dc6f2cfb4
2004-05-11Merge zizzer.eecs.umich.edu:/bk/linuxLisa Hsu
into shizzle.(none):/home/hsul/work/linux --HG-- extra : convert_revision : 729b97489f990bffd23add762582b73d2eb2137d
2004-05-11successful merge, linux still builds and runs as far it used to, network ↵Lisa Hsu
device still transmit ARP packet. arch/alpha/alpha_memory.cc: change to the main m5 tree convention for naming base/traceflags.py: add ide and pciconfigall traceflags kern/linux/linux_system.cc: kern/linux/linux_system.hh: kill some old binning styled stuff --HG-- extra : convert_revision : 0558878906817975a714b1c7c08f9ee405468535
2004-05-11Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 879834af81a124b1f1b546f1591713a8c36913e4
2004-05-11Changes to fix bad DMA handling by disk when using scatter gather pageAndrew Schultz
mappings (writes still unverified, and read could probably be looked over a bit more too) dev/ide_disk.cc: dev/ide_disk.hh: Major changes to fix bogus handling of dma transfers. The read seems to work pretty well, but the write is unverfied until we can get a disk image that actually tries to write. dev/tsunami_pchip.cc: Change mask to properly mask 13 bits not 12 --HG-- extra : convert_revision : 08fe9bc32970e449cd045de479553a96a4e389d6
2004-05-11first pass at merging m5 with linuxLisa Hsu
--HG-- extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
2004-05-10dma_bus_interface_impl.hh:Steve Reinhardt
Fix template param (breaks on g++ 3.3). --HG-- extra : convert_revision : b469aa9aab105bbc5a72a20a48a4abd2e218ff8c
2004-05-10Do a better job of factoring out CPU model in ISA description.Steve Reinhardt
(Still not perfect though.) arch/alpha/isa_desc: Do a better job of factoring out CPU model. (Still not perfect though.) Pull execute() methods out of class declarations into separate section of file, allowing (1) easier replication for different CPU models and (2) a path to putting them all in a separate file. Force all instruction execution context into a single model-dependent class (SimpleCPU itself for SimpleCPU, DynInst for FullCPU). arch/isa_parser.py: Do a better job of factoring out CPU model. (Still not perfect though.) Pull execute() methods out of class declarations into separate section of file, allowing (1) easier replication for different CPU models and (2) a path to putting them all in a separate file. Also restructure top level to allow parser to run under interactive interpreter session for easier debugging. cpu/exec_context.hh: Add a few new methods to clean up isa_desc. cpu/simple_cpu/simple_cpu.cc: cpu/static_inst.hh: StaticInst::execute no longer takes a CPU and an ExecContext, just a unified FooCPUExecContext. cpu/simple_cpu/simple_cpu.hh: Add methods to redirect calls to ExecContext so SimpleCPU can act as sole instruction execution context for itself. Typedef SimpleCPU to SimpleCPUExecContext. --HG-- extra : convert_revision : ecc445503bc585585da5663fe61796580e744da6
2004-05-09Added ULL for 64bit intsAli Saidi
Added function to skip determine_cpu_caches(). We may have to update this in the future: see note below. arch/alpha/alpha_memory.cc: dev/ide_ctrl.cc: dev/tsunamireg.h: Added ULL for 64bit ints kern/linux/linux_system.cc: Added a function to skip determine_cpu_caches, right now it is only used for printing in proc, however in the future we may either want to implement the SC_CTL IPR register or manually set alpha_l1i_cacheshape, alpha_l1d_cacheshape, alpha_l2_cacheshape, alpha_l3_cacheshape to ((size << 10) | (linesize>>1)<<4 | way) kern/linux/linux_system.hh: added event to skip determine_cpu_caches() --HG-- extra : convert_revision : 1065f2091bbe6832b730af490f5b4672c2afedce
2004-05-08Very minor fixes.Steve Reinhardt
util/tracediff: stats:file option is now stats:text_file --HG-- extra : convert_revision : 74b6294da0003345e84bc1533d536dab271b6033
2004-05-07MergeSteve Reinhardt
--HG-- extra : convert_revision : 7999c243a80482b9feffdf8f3dd4ff061b189377
2004-05-06don't do dependencies on make generateNathan Binkert
--HG-- extra : convert_revision : 0dac37a1676e795bf2ebf9572e37b6b78af7929a
2004-05-06Whole mess'o'changes.. see individual filesAndrew Schultz
arch/alpha/vtophys.cc: Removed buggy code that tries to fix PAL addresses (may cause problems while trying to debug in PAL code, but that should do this fix outside of vtophys) base/loader/symtab.cc: base/loader/symtab.hh: cpu/exetrace.cc: Changed InstExec traces to always print a symbol name dev/ide_ctrl.cc: dev/ide_disk.cc: Tabs dev/ide_disk.hh: Change buffer size dev/tsunami_pchip.cc: Fix translatePciToDma to support scatter gather mapping kern/linux/linux_system.cc: Force simulator to wait until remote debugger attaches (should be removed or turned on/off with a flag) --HG-- extra : convert_revision : 1d08aebe3f448c87a963dd613de3e2e0cff0d48d
2004-05-06Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5Nathan Binkert
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest --HG-- extra : convert_revision : 12234085865daa71e32981177d3376c93b3ed11e
2004-05-06add support for sticking generated files in the build directoryNathan Binkert
instead of with the source code. This will hopefully be especially useful when we're generating dozens of files when we flesh out the object description stuff. remove generated files from the source tree. python is required to build now. base/trace.hh: no need for the underscore in the name base/traceflags.py: clean up code --HG-- extra : convert_revision : f68af8c3460eb7e73a1defaea3081a02ad7db33c
2004-05-05Documentation fixesErik Hallnor
--HG-- extra : convert_revision : 9f62115463e6e624a95ae83189dac21c593a2ee4
2004-05-04file used by old compile time binning which lisa's since fixedNathan Binkert
--HG-- extra : convert_revision : b8ae8371fdf22b601bcfd15ce7c28af6ed081dc0
2004-05-04add a bit more data to the rob dumpNathan Binkert
--HG-- extra : convert_revision : 99f76a62d1a1f057868c4303905cc269fd56aab7
2004-05-04Major stats package cleanupNathan Binkert
Add support for generic visitors for stats and use them to implement independent output functions. Support for mysql output and some initial code for hacking on mysql output with python arch/alpha/pseudo_inst.cc: base/hybrid_pred.cc: base/hybrid_pred.hh: base/sat_counter.cc: base/sat_counter.hh: cpu/simple_cpu/simple_cpu.cc: kern/tru64/tru64_events.cc: sim/main.cc: sim/process.cc: sim/process.hh: sim/sim_events.cc: sim/sim_object.cc: sim/system.hh: update for changes in stats package base/statistics.cc: move the python output code to base/stats/puthon.(cc|hh) and reimplement it as a visitor. move the text output code to base/stats/text.(cc|hh) and reimplement it as a visitor. move the database stuff into base/stats/statdb.(cc|hh) and get rid of the class. Put everything as globals in the Statistics::Database namespace. allocate unique ids for all stats. directly implement the check routine and get rid of the various dumping routines since they're now in separate files. make sure that no two stats have the same name clean up some loops base/statistics.hh: major changes to the statistics package again lots of code was factored out of statistics.hh into several separate files in base/stats/ (this will continue) There are now two Stat package types Result and Counter that are specified to allow the user to keep the counted type separate from the result type. They are currently both doubles but that's an experiment. There is no more per stat ability to set the type. Statistics::Counter is not the same as Counter! Implement a visitor for statistics output so that new output types can be implemented independently from the stats package itself. Add a unique id to each stat so that it can be used to keep track of stats more simply. This number can also be used in debugging problems with stats. Tweak the bucket size stuff a bit to make it work better. fixed VectorDist size bug cpu/memtest/memtest.cc: Fix up for changes in stats package Don't use value() since it doesn't work with binning. If you want a number as a stat, and to use it in the program itself, you really want two separate variables, one that's a stat, and one that's not. cpu/memtest/memtest.hh: Fix up for changes in stats package test/Makefile: Try to build stuff now that directories matter test/stattest.cc: test all new output types choose which one with command line options --HG-- extra : convert_revision : e3a3f5f0828c67c0e2de415d936ad240adaddc89
2004-05-04Update for doxygen 1.3.6Erik Hallnor
--HG-- extra : convert_revision : e7a1820a5651dc68e2927194aeabd23a3d852487
2004-05-04Function for getting usernameNathan Binkert
--HG-- extra : convert_revision : 50c0bf7b083e780071e85fabdcd6f91a96f4b2e3
2004-05-04don't duplicate stat namesNathan Binkert
--HG-- extra : convert_revision : 2a19b12457cb19e233e4b133044ff95eb5d44e2f
2004-05-03Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 8eca0fba9d96bffea7a24bce9b14f0284bd58c83
2004-05-03Checkin of latest IDE and some separation between platforms (Tsunami andAndrew Schultz
Turbolaser) base/range.hh: Change semantics of range to be inclusive of the end value, may need to check other users of range to make sure they are semantically correct. This was needed for access of last byte in range of address on IDE and makes sense for case of range from 0 to all f dev/ide_ctrl.cc: dev/ide_ctrl.hh: dev/ide_disk.cc: dev/ide_disk.hh: Whole mess of changes.. at current state simulator will boot and read partition table and then have a bunch of errors and panic dev/pciconfigall.cc: dev/pciconfigall.hh: dev/platform.hh: Changes to work with platform separation dev/tsunami.cc: dev/tsunami.hh: Change to work with platform separation --HG-- extra : convert_revision : e1de22b54df7fdcf391efc2a8555ada93f46beab
2004-04-29Derive from SimObject so stats are registered.Erik Hallnor
--HG-- extra : convert_revision : cbc70641235f040ebff6a98de7ff6384e06b8dbd
2004-04-29Change the way the DMAInterface works internally to make it easier to change ↵Erik Hallnor
things in the future. --HG-- extra : convert_revision : 2f7275f95433918549e76b16a8903e5df2d0188c