Steve Reinhardt [Tue, 6 Feb 2007 06:05:00 +0000 (22:05 -0800)]
Use an instance counter to give Events repeatable IDs
in debugging mode (especially valuable for tracediff).
--HG--
extra : convert_revision :
227434a06b5271a8300f2f6861bd06c4ac19e6c4
Lisa Hsu [Thu, 1 Feb 2007 20:35:26 +0000 (15:35 -0500)]
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5
--HG--
extra : convert_revision :
62a0017a1147631513db7878f4e4d08fca776bc1
Lisa Hsu [Thu, 1 Feb 2007 20:34:52 +0000 (15:34 -0500)]
only increment numPosted if an interrupt of that type hasn't been posted before.
--HG--
extra : convert_revision :
6671c594b78d2e38449069157f39af96b81340f2
Gabe Black [Thu, 1 Feb 2007 00:44:50 +0000 (19:44 -0500)]
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem
--HG--
extra : convert_revision :
c02e184f69251dc6eeccdcb244788365aa12f7ee
Gabe Black [Wed, 31 Jan 2007 23:47:23 +0000 (18:47 -0500)]
Create reference outputs for this regression.
--HG--
extra : convert_revision :
91e0144fef3f66d413417ad0318f43f752494e3c
Ali Saidi [Wed, 31 Jan 2007 23:32:27 +0000 (18:32 -0500)]
make sparc fs less chatty
src/SConscript:
strip doesn't take a src and dest in solaris
--HG--
extra : convert_revision :
57f95eda0e3232475a5b55753ace3f3f0fced8b3
Ali Saidi [Tue, 30 Jan 2007 23:27:16 +0000 (18:27 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
276b640c5c5a51e88e9bd630960ad462d9f0cb8d
Ali Saidi [Tue, 30 Jan 2007 23:27:04 +0000 (18:27 -0500)]
add fsr to the list of registers we are interested in
--HG--
extra : convert_revision :
2cc0d0144abab264aa0ec8c07242cdab2dffd4f8
Ali Saidi [Tue, 30 Jan 2007 23:25:39 +0000 (18:25 -0500)]
Make SPARC checkpointing work
src/arch/sparc/floatregfile.cc:
Fix serialization for fpreg
src/arch/sparc/intregfile.cc:
fix serialization for intreg
src/arch/sparc/miscregfile.cc:
fix serialization from miscreg
src/arch/sparc/pagetable.cc:
fix serialization for page table
src/arch/sparc/regfile.cc:
need to serialize nnpc
src/arch/sparc/tlb.cc:
write serialization code for tlb
src/cpu/base.cc:
provide a way to find the thread number a context is
serialize the instruction counter
src/cpu/base.hh:
provide a way to find the thread number a context is
and given a thread number find a context pointer
src/cpu/cpuevent.hh:
provide method to get thread context from a cpu event for serialization
src/dev/sparc/t1000.cc:
src/dev/sparc/t1000.hh:
nothing to serialize in t1000
src/sim/serialize.cc:
src/sim/serialize.hh:
Make findObj() work (it hasn't since we did the python conversion stuff)
--HG--
extra : convert_revision :
a95bc4e3c3354304171efbe3797556fdb146bea2
Ali Saidi [Tue, 30 Jan 2007 23:21:42 +0000 (18:21 -0500)]
fix some checkpointing annoyances
-m works as you think it should
Ctrl-C actually ends the simulation now
--HG--
extra : convert_revision :
f2269dc90d165c716459ec61f5f7b1ea3c1d4ae2
Gabe Black [Tue, 30 Jan 2007 21:12:47 +0000 (16:12 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision :
7b332ee4c737206511d26db391117eb1fe5ea290
Gabe Black [Tue, 30 Jan 2007 21:12:38 +0000 (16:12 -0500)]
Implemented fbfss and fbpfcc instructions, and cleaned up branch code a little.
src/arch/sparc/isa/base.isa:
Added passesFpCondition function to help with fbfcc and fbpfcc instructions.
src/arch/sparc/isa/decoder.isa:
Added fbfcc and fbpfcc instructions, and cleaned up branch code slightly.
src/arch/sparc/isa/formats/branch.isa:
Minor cleanup.
--HG--
extra : convert_revision :
6586b46418f1f70bace41407f267fee30c657714
Ali Saidi [Tue, 30 Jan 2007 19:43:25 +0000 (14:43 -0500)]
change std::isnan() to a using namespace std and isnan(). We need a better way to do this.
--HG--
extra : convert_revision :
4f59ca8e6425db23f57a1f3f65a4874e483d0ecc
Ali Saidi [Tue, 30 Jan 2007 16:22:22 +0000 (11:22 -0500)]
use std:: for isnan() and fix decoding of fcmpe*
--HG--
extra : convert_revision :
06be0f8572e26c3c7e761b482248304ce1afa038
Gabe Black [Tue, 30 Jan 2007 07:45:59 +0000 (02:45 -0500)]
sizeof with a pointer to dynamically allocated memory will return the size of the pointer, not the memory.
--HG--
extra : convert_revision :
04647d9fa0c464960d37797717f8171862cf48f8
Gabe Black [Tue, 30 Jan 2007 07:44:24 +0000 (02:44 -0500)]
Make clearSingleStep in SPARC a warning, and rephrase the panic for setSingleStep
--HG--
extra : convert_revision :
fde27a1faa6c03a24a4321a153dfa89a438f9a32
Gabe Black [Tue, 30 Jan 2007 05:21:18 +0000 (00:21 -0500)]
Make the FpUnimpl format actually write the Fsr.
--HG--
extra : convert_revision :
84717cd3a8fa9fb85bd0693304e05ef475b05d07
Gabe Black [Tue, 30 Jan 2007 05:08:42 +0000 (00:08 -0500)]
Added FpUnimpl format for quad precision and other purposefully unimplemented floating point ops.
--HG--
extra : convert_revision :
356fec86c35560b20ea8eee80844602bbcec145f
Gabe Black [Tue, 30 Jan 2007 03:57:18 +0000 (22:57 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision :
0e4a54c21f32fec13deaf00b5d61c258007f172b
Gabe Black [Tue, 30 Jan 2007 03:54:28 +0000 (22:54 -0500)]
Fix the Frs?s operands to use single width by default, rather than double width.
--HG--
extra : convert_revision :
36137ee025dc5c79665b041b43bd89505715ca70
Gabe Black [Tue, 30 Jan 2007 03:52:54 +0000 (22:52 -0500)]
Add implementation for the fcmp instructions. These don't behave -quite- right with respect to quite NaNs, but hopefully we don't need to worry about the distinction.
--HG--
extra : convert_revision :
67b6583a20530b7a393aa04d0b71031d3c72ecdd
Gabe Black [Tue, 30 Jan 2007 03:46:01 +0000 (22:46 -0500)]
Fix the FCMPCC bitfield.
--HG--
extra : convert_revision :
d2c538e7f469bd12a80eb8585c78d5325d6e6141
Ali Saidi [Tue, 30 Jan 2007 00:04:06 +0000 (19:04 -0500)]
timegm() is a gnuism... replace with the code from the timegm() man page
--HG--
extra : convert_revision :
f2b80a0b7768edc370e3f07c45cb3bb9a46450a9
Ali Saidi [Tue, 30 Jan 2007 00:03:14 +0000 (19:03 -0500)]
fix some over sights in moving windowing and ccr registers to int reg file
--HG--
extra : convert_revision :
4e83e5163076aeef72ec5caf1e0d7adea11da875
Ali Saidi [Mon, 29 Jan 2007 19:46:30 +0000 (14:46 -0500)]
m5stats.txt shouldn't be committed
--HG--
extra : convert_revision :
362a03f5f5e31a813c26bd8fa55949c9cd8a98ba
Ali Saidi [Mon, 29 Jan 2007 19:44:45 +0000 (14:44 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
7b8b791815d1fb51cc7ad085307a640b2ee51642
Gabe Black [Mon, 29 Jan 2007 15:52:13 +0000 (10:52 -0500)]
Process the actual code as well.
--HG--
extra : convert_revision :
1221bfafe7af48ab04f63391f78eaf49d16077b3
Gabe Black [Mon, 29 Jan 2007 15:49:59 +0000 (10:49 -0500)]
Cleaned up disassembly a little.
--HG--
extra : convert_revision :
4665ac7760c9b78a1d7699ceeb541b694211a947
Gabe Black [Mon, 29 Jan 2007 15:48:20 +0000 (10:48 -0500)]
A minor hack to get branch prediction to behave like before on Alpha.
--HG--
extra : convert_revision :
1eaabd13c72aa42c512a04d162a87491818bc621
Gabe Black [Mon, 29 Jan 2007 15:46:54 +0000 (10:46 -0500)]
Fixed a warning about an unused variable.
--HG--
extra : convert_revision :
f9c78e86b60c3085cd95b1b4e132205e0ef584dd
Gabe Black [Sun, 28 Jan 2007 23:28:34 +0000 (18:28 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision :
7bea2cb13e2de527134d98d4ee21a55dc4a7d1ad
Ali Saidi [Sun, 28 Jan 2007 21:18:44 +0000 (16:18 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
e302dc4d7a20646bb0ea363127b2658a6d6e810c
Ali Saidi [Sun, 28 Jan 2007 20:55:44 +0000 (15:55 -0500)]
Merge zizzer:/bk/newmem
into pb15.local:/Users/ali/work/m5.newmem.head
--HG--
extra : convert_revision :
b4db0b350c8a5b3452ede74e5b42eec8ed6685c3
Ali Saidi [Sun, 28 Jan 2007 20:42:01 +0000 (15:42 -0500)]
make unimplemented ops fail
return correct traps for ua2005 fpops that aren't implemented in hw
--HG--
extra : convert_revision :
998fd43f77c5de7078bac1c6caab296b18c9366d
Ali Saidi [Sun, 28 Jan 2007 20:30:54 +0000 (15:30 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
f25fd4855a1eaaecb29e6ccc3cee22cf07e4108b
Ali Saidi [Sun, 28 Jan 2007 20:30:14 +0000 (15:30 -0500)]
fix comparing fp registers between legion and m5
make fp writes also chatty with the Sparc traceflag
src/arch/sparc/floatregfile.cc:
make fp writes also chatty with the Sparc traceflag
src/cpu/exetrace.cc:
fix comparing fp registers between legion and m5
--HG--
extra : convert_revision :
f3703afae56249f137451262bc1b6919d465e714
Gabe Black [Sun, 28 Jan 2007 19:46:56 +0000 (14:46 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision :
2398e48722dd71ddf270e93bd7b387078fb30e6b
Nathan Binkert [Sun, 28 Jan 2007 18:26:59 +0000 (10:26 -0800)]
Stick the conversion of python to unix time with all of
the other param code so that other functions can use it
as well.
--HG--
extra : convert_revision :
a8becdeadc70af0b64bff5b0770788dfba6e1857
Ali Saidi [Sat, 27 Jan 2007 20:47:18 +0000 (15:47 -0500)]
I missed a couple of things
--HG--
extra : convert_revision :
2fa44718e381ff743fa1cf12f4db2221dca87e4c
Ali Saidi [Sat, 27 Jan 2007 20:38:04 +0000 (15:38 -0500)]
While I'm waiting for legion to run make m5 compile with a few more compilers
SConstruct:
src/SConscript:
Add flags for Intel CC while i'm at it
src/base/compiler.hh:
the _Pragma stuff needst to be called this way unless someone happens to have a cleaner way
src/base/cprintf_formats.hh:
add std:: where appropriate
src/base/statistics.hh:
use this->map since icc was getting confused about std::map vs the locally defined map
src/cpu/static_inst.hh:
Add some more dummy returns where needed
src/mem/packet.hh:
add more dummy returns where needed
src/sim/host.hh:
use limits to come up with max tick
--HG--
extra : convert_revision :
08e9f7898b29fb9d063136529afb9b6abceab60c
Gabe Black [Sat, 27 Jan 2007 06:59:20 +0000 (01:59 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/system.cc:
Hand Merge
--HG--
extra : convert_revision :
d5e0c97caebb616493e2f642e915969d7028109c
Gabe Black [Sat, 27 Jan 2007 06:49:21 +0000 (01:49 -0500)]
Got rid of some DPRINTFs that were printing raw pointers.
--HG--
extra : convert_revision :
a79f5ee225208338594e7c4ecf0a71fef941918c
Gabe Black [Sat, 27 Jan 2007 06:47:07 +0000 (01:47 -0500)]
Fixed up printReg so that control registers are printed by name. This is possible now becauase Ctrl_Base_DepTag gets added into control register numbers.
--HG--
extra : convert_revision :
d6de3be277127547cd942769cd34a54a4ec8db32
Ali Saidi [Sat, 27 Jan 2007 00:00:38 +0000 (19:00 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
ca6e616e64d4528478c1505dc7ce111b8888d389
Ali Saidi [Sat, 27 Jan 2007 00:00:17 +0000 (19:00 -0500)]
forgot to include this file
--HG--
extra : convert_revision :
4b570a33a951e9286b38873b2be3651ffaee8532
Ali Saidi [Fri, 26 Jan 2007 23:57:35 +0000 (18:57 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
53ee81b099930d4d827db99e2d944ffb8645c706
Ali Saidi [Fri, 26 Jan 2007 23:57:16 +0000 (18:57 -0500)]
Make Sparc traceflag even more chatty
some fixes to fp instructions to use the single precision registers
if this is an fp op emit fp check code
add fpregs to m5legion struct
src/arch/sparc/floatregfile.cc:
Make Sparc traceflag even more chatty
src/arch/sparc/isa/base.isa:
add code to check if the fpu is enabled
src/arch/sparc/isa/decoder.isa:
some fixes to fp instructions to use the single precision registers
fix smul again
fix subc/subcc/subccc condition code setting
src/arch/sparc/isa/formats/basic.isa:
src/arch/sparc/isa/formats/mem/util.isa:
if this is an fp op emit fp check code
src/cpu/exetrace.cc:
check fp regs as well as int regs
src/cpu/m5legion_interface.h:
add fpregs to m5legion struct
--HG--
extra : convert_revision :
e7d26d10fb8ce88f96e3a51f84b48c3b3ad2f232
Ali Saidi [Fri, 26 Jan 2007 23:50:28 +0000 (18:50 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc
--HG--
extra : convert_revision :
1706f6218abec7eb575dcff3ad4aef83894f64ab
Ali Saidi [Fri, 26 Jan 2007 23:49:40 +0000 (18:49 -0500)]
Merge zeep.pool:/z/saidi/work/m5.newmem
into zeep.pool:/z/saidi/work/m5.suncc
--HG--
extra : convert_revision :
20f61a524a3b53fc0afcf53a24b5a1fe1d96f579
Ali Saidi [Fri, 26 Jan 2007 23:48:51 +0000 (18:48 -0500)]
make our code a little more standards compliant
pretty close to compiling w/ suns compiler
briefly:
add dummy return after panic()/fatal()
split out flags by compiler vendor
include cstring and cmath where appropriate
use std namespace for string ops
SConstruct:
Add code to detect compiler and choose cflags based on detected compiler
Fix zlib check to work with suncc
src/SConscript:
split out flags by compiler vendor
src/arch/sparc/isa/decoder.isa:
use correct namespace for sqrt
src/arch/sparc/isa/formats/basic.isa:
add dummy return around panic
src/arch/sparc/isa/formats/integerop.isa:
use correct namespace for stringops
src/arch/sparc/isa/includes.isa:
include cstring and cmath where appropriate
src/arch/sparc/isa_traits.hh:
remove dangling comma
src/arch/sparc/system.cc:
dummy return to make sun cc front end happy
src/arch/sparc/tlb.cc:
src/base/compression/lzss_compression.cc:
use std namespace for string ops
src/arch/sparc/utility.hh:
no reason to say something is unsigned unsigned int
src/base/compression/null_compression.hh:
dummy returns to for suncc front end
src/base/cprintf.hh:
use standard variadic argument syntax instead of gnuc specefic renaming
src/base/hashmap.hh:
don't need to define hash for suncc
src/base/hostinfo.cc:
need stdio.h for sprintf
src/base/loader/object_file.cc:
munmap is in std namespace not null
src/base/misc.hh:
use M5 generic noreturn macros
use standard variadic macro __VA_ARGS__
src/base/pollevent.cc:
we need file.h for file flags
src/base/random.cc:
mess with include files to make suncc happy
src/base/remote_gdb.cc:
malloc memory for function instead of having a non-constant in an array size
src/base/statistics.hh:
use std namespace for floor
src/base/stats/text.cc:
include math.h for rint (cmath won't work)
src/base/time.cc:
use suncc version of ctime_r
src/base/time.hh:
change macro to work with both gcc and suncc
src/base/timebuf.hh:
include cstring from memset and use std::
src/base/trace.hh:
change variadic macros to be normal format
src/cpu/SConscript:
add dummy returns where appropriate
src/cpu/activity.cc:
include cstring for memset
src/cpu/exetrace.hh:
include cstring fro memcpy
src/cpu/simple/base.hh:
add dummy return for panic
src/dev/baddev.cc:
src/dev/pciconfigall.cc:
src/dev/platform.cc:
src/dev/sparc/t1000.cc:
add dummy return where appropriate
src/dev/ide_atareg.h:
make define work for both gnuc and suncc
src/dev/io_device.hh:
add dummy returns where approirate
src/dev/pcidev.hh:
src/mem/cache/cache_impl.hh:
src/mem/cache/miss/blocking_buffer.cc:
src/mem/cache/tags/lru.hh:
src/mem/cache/tags/split.hh:
src/mem/cache/tags/split_lifo.hh:
src/mem/cache/tags/split_lru.hh:
src/mem/dram.cc:
src/mem/packet.cc:
src/mem/port.cc:
include cstring for string ops
src/dev/sparc/mm_disk.cc:
add dummy return where appropriate
include cstring for string ops
src/mem/cache/miss/blocking_buffer.hh:
src/mem/port.hh:
Add dummy return where appropriate
src/mem/cache/tags/iic.cc:
cast hastSets to double for log() call
src/mem/physical.cc:
cast pmemAddr to char* for munmap
src/sim/byteswap.hh:
make define work for suncc and gnuc
--HG--
extra : convert_revision :
ef8a1f1064e43b6c39838a85c01aee4f795497bd
Gabe Black [Fri, 26 Jan 2007 21:38:29 +0000 (16:38 -0500)]
Fixed the number of integer registers. There are MaxGL+1 sets of globals, not just MaxGL.
--HG--
extra : convert_revision :
6fd090f112611db1e72a1f129dff03687d52930a
Lisa Hsu [Fri, 26 Jan 2007 17:51:24 +0000 (12:51 -0500)]
Merge zizzer:/bk/newmem
into zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5
--HG--
extra : convert_revision :
1b854ec7caa33d3009383754206b643494c4c42d
Lisa Hsu [Fri, 26 Jan 2007 17:51:07 +0000 (12:51 -0500)]
eliminate cpu checkInterrupts bool, it is redundant and unnecessary.
--HG--
extra : convert_revision :
58e960e5019f944c7ec5606e4b8c93ce42330719
Nathan Binkert [Fri, 26 Jan 2007 00:14:05 +0000 (19:14 -0500)]
Move time forward to Jan 1, 2009 and update stats
--HG--
extra : convert_revision :
9398362237443dc659f423a342bd27c923e90aea
Nathan Binkert [Thu, 25 Jan 2007 20:00:04 +0000 (15:00 -0500)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.pool:/y/binkertn/research/m5/rtc
--HG--
extra : convert_revision :
65ddda89f38c5fa874722c20e5d82ed1bb4e12d9
Nathan Binkert [Thu, 25 Jan 2007 19:59:41 +0000 (14:59 -0500)]
Instead of passing an int to represent time between python and C++
pass the tuple of python's struct_time and interpret that.
Fixes a problem where the local timezone leaked into the time
calculation. Also fix things so that the unix, python, and RTC
data sheets all get the right time. Provide both years since 1900
and BCD two digit year.
Put the date back at 1/1/2006 for now.
--HG--
extra : convert_revision :
473244572f468de2cb579a3dd7ae296a6f81f5d7
Ali Saidi [Thu, 25 Jan 2007 18:43:46 +0000 (13:43 -0500)]
fix smul and sdiv to sign extend, and handle overflow/underflow corretly
Only allow writing/reading of 32 bits of Y
Only allow writing/reading 32 bits of pc when pstate.am
Put any loaded data on the first half of a micro-op in uReg0 so it can't
overwrite the register we are using for address calculation
only erase a entry from the lookup table if it's valid
Put in a temporary check to make sure that lookup table and tlb array stay in sync
if we are interrupted in the middle of a mico-op, reset the micropc/nexpc
so we start on the first part of it when we come back
src/arch/sparc/isa/decoder.isa:
fix smul and sdiv to sign extend, and handle overflow/underflow corretly
Only allow writing/reading of 32 bits of Y
Only allow writing/reading 32 bits of pc when pstate.am
Put any loaded data on the first half of a micro-op in uReg0 so it can't
overwrite the register we are using for address calculation
src/arch/sparc/isa/formats/mem/blockmem.isa:
Put any loaded data on the first half of a micro-op in uReg0 so it can't
overwrite the register we are using for address calculation
src/arch/sparc/isa/includes.isa:
Use limits for 32bit underflow/overflow detection
src/arch/sparc/tlb.cc:
only erase a entry from the lookup table if it's valid
Put in a temporary check to make sure that lookup table and tlb array stay in sync
src/arch/sparc/tlb_map.hh:
add a print function to dump the tlb lookup table
src/cpu/simple/base.cc:
if we are interrupted in the middle of a mico-op, reset the micropc/nexpc
so we start on the first part of it when we come back
--HG--
extra : convert_revision :
50a23837fd888393a5c2aa35cbd1abeebb7f55d4
Gabe Black [Thu, 25 Jan 2007 06:13:56 +0000 (01:13 -0500)]
Fixed a warning that was breaking compilation.
--HG--
extra : convert_revision :
007e83ab452849ce527fe252148e7a1dc423c850
Gabe Black [Thu, 25 Jan 2007 00:57:36 +0000 (19:57 -0500)]
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision :
2d7ae62a59b91d735bbac093f8a4ab542ea75eee
Ali Saidi [Tue, 23 Jan 2007 20:50:03 +0000 (15:50 -0500)]
use pstate.am to mask off PC/NPC where it needs to +be
check writability of tlb cache entry before using
update tagaccess in places I forgot to
move the tlb privileged test up since it is higher priority
src/arch/sparc/faults.cc:
save only 32 bits of PC/NPC if Pstate.am is set
src/arch/sparc/isa/decoder.isa:
return only 32 bits of PC/NPC if Pstate.am is set
increment cleanwin correctly
src/arch/sparc/tlb.cc:
check writability of cache entry
update tagaccess in a few more places
move the privileged test up since it is higher priority
src/cpu/exetrace.cc:
mask off upper bits of pc if pstate.am is set before comparing to legion
--HG--
extra : convert_revision :
02a51c141ee3f9a2600c28eac018ea7216f3655c
Gabe Black [Tue, 23 Jan 2007 07:44:44 +0000 (23:44 -0800)]
Update to stats because of minor to branch mispredict accounting.
--HG--
extra : convert_revision :
bfb7db6bd118b623f6a38c05a962dc44456160cb
Gabe Black [Tue, 23 Jan 2007 07:38:17 +0000 (23:38 -0800)]
Fix for slightly garbled hand merge
--HG--
extra : convert_revision :
f9be59e94311571d91b6793b1caa1b6136ef864c
Gabe Black [Tue, 23 Jan 2007 06:31:48 +0000 (22:31 -0800)]
Merge zizzer.eecs.umich.edu:/bk/newmem
into ewok.(none):/home/gblack/m5/newmemo3
src/sim/byteswap.hh:
Hand Merge
--HG--
extra : convert_revision :
640d33ad0c416934e8a5107768e7f1dce6709ca8
Gabe Black [Tue, 23 Jan 2007 06:22:09 +0000 (22:22 -0800)]
Added remote gdb objects to each process
--HG--
extra : convert_revision :
1b5c1470ffc52b2f7719e469153702dec694f9a3
Ali Saidi [Tue, 23 Jan 2007 02:57:01 +0000 (21:57 -0500)]
fix compiling on x86/Solaris
--HG--
extra : convert_revision :
f7d21fc277dd7172c244d83fb012883dc8b67895
Ali Saidi [Tue, 23 Jan 2007 02:55:43 +0000 (21:55 -0500)]
clean up fault code a little bit
simplify and make complete some asi checks
implement all the twin asis and remove panic checks on their use
soft int is supported, so we don't need to print writes to it
src/arch/sparc/asi.cc:
make AsiIsLittle() be all the little asis.
Speed up AsiIsTwin() a bit
src/arch/sparc/faults.cc:
clean up the do*Fault code.... Make it work like legion, in particular
pstate.priv is left alone, not set to 0 like the spec says
src/arch/sparc/isa/decoder.isa:
implement some more twin ASIs
src/arch/sparc/tlb.cc:
All the twin asis are implemented, no need to say their not supported anymore
src/arch/sparc/ua2005.cc:
softint is supported now, no more need to
--HG--
extra : convert_revision :
aef2a1b93719235edff830a17a8ec52f23ec9f8b
Ali Saidi [Tue, 23 Jan 2007 02:45:29 +0000 (21:45 -0500)]
we decided to check for .interp instead of .dynamic
--HG--
extra : convert_revision :
4f5c7f9c7653e1e9ebbd488c07426d9f944bb25f
Ali Saidi [Mon, 22 Jan 2007 21:17:11 +0000 (16:17 -0500)]
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision :
21e1bfa49a933f3b39bd2e7bcd873428f9d01a1b
Ali Saidi [Mon, 22 Jan 2007 21:14:06 +0000 (16:14 -0500)]
check if an executable is dynamic and die if it is
Only implemented for ELf. Someone might want to implement it for ecoff and some point
src/base/loader/elf_object.cc:
src/base/loader/elf_object.hh:
src/base/loader/object_file.cc:
src/base/loader/object_file.hh:
add a function to check if an executable is dynamic
src/sim/process.cc:
check if an executable is dynamic and die if it is
--HG--
extra : convert_revision :
830b1b50b08a5abaf895ce6251bbc702c986eebf
Ali Saidi [Mon, 22 Jan 2007 21:11:49 +0000 (16:11 -0500)]
use writeTagAccess() function to unify writing of Tag access registers
Fix extracting of secondary context to shove into tag access register
properly sign extend va from 59 bits to 63 (SPARC VA hole)
--HG--
extra : convert_revision :
5d0c2b4db63338c31b2d29b4bb68f39e1d4f4c7b
Ali Saidi [Mon, 22 Jan 2007 01:02:41 +0000 (20:02 -0500)]
make sure that page bits of VA on tlb insert are 0
--HG--
extra : convert_revision :
f04af884687e9b8631e910cf62cd4a58d035c744
Ali Saidi [Sun, 21 Jan 2007 23:04:40 +0000 (18:04 -0500)]
add dumb time of day device
--HG--
extra : convert_revision :
52e51ff49f7ed73065f04707ded06dc7254292c4
Ali Saidi [Sun, 21 Jan 2007 04:12:32 +0000 (23:12 -0500)]
fix InterruptLevel code to return the correct level
(the bit positition that is set in softint)
--HG--
extra : convert_revision :
ba0e1f4ec1f74aac64c3f9bb7eb1b771e17b013a
Ali Saidi [Sun, 21 Jan 2007 04:10:43 +0000 (23:10 -0500)]
atually set all 64 bits of the retun value to 0
--HG--
extra : convert_revision :
77bfdf07a49d41a2392f429fdc632c1461ac504c
Ali Saidi [Sun, 21 Jan 2007 04:09:28 +0000 (23:09 -0500)]
fix flushw implementation
--HG--
extra : convert_revision :
136b2bddc7cb70cde30e930ad3a13bd56c7162e1
Ali Saidi [Sat, 20 Jan 2007 17:37:02 +0000 (12:37 -0500)]
Rearange tlb code to remove some duplicate
Sparc error register should return ull(0) since it's 64 bits
Fix PS1 pointer creation to use the ps1 page size rather than ps0
--HG--
extra : convert_revision :
fb4ef4b90270c8db676ffe53578acfa3c244526e
Ali Saidi [Sat, 20 Jan 2007 17:34:00 +0000 (12:34 -0500)]
Spill and Fill handlers are actually n*4 + the start address
--HG--
extra : convert_revision :
a42f01a84e4b7ba9e6029df50e1612d410a8ba22
Lisa Hsu [Sat, 20 Jan 2007 02:34:21 +0000 (21:34 -0500)]
Merge zed.eecs.umich.edu:/.automount/zeep/z/saidi/work/m5.newmem
into zed.eecs.umich.edu:/z/hsul/work/sparc/x86.m5
--HG--
extra : convert_revision :
9b8567bb775ed6fcc30096f1ab4cc37058bc7376
Lisa Hsu [Sat, 20 Jan 2007 02:33:36 +0000 (21:33 -0500)]
some hstick and hintp changes.
src/arch/sparc/interrupts.hh:
condition hstick matches on HINTP
src/arch/sparc/miscregfile.cc:
implement HINTP
src/arch/sparc/ua2005.cc:
don't post interrupt unless it is enabled.
--HG--
extra : convert_revision :
f71d1c1d9fd1a898ddafd5a885c3a8d5c75e8ff0
Ali Saidi [Wed, 17 Jan 2007 23:36:12 +0000 (18:36 -0500)]
Allow ASI_LDTX_REAL
--HG--
extra : convert_revision :
ba1af012ab8ac61a25058977cb7ec511eb2cf3cb
Ali Saidi [Wed, 17 Jan 2007 22:59:22 +0000 (17:59 -0500)]
do a linear search for matching tlb entries instead of using map because you could be mapping a larger page that intersects many
fix for lookup table to keep it consistant with tlb on a replace of a specific entry
--HG--
extra : convert_revision :
5a14fbcdcfc13156c63fa41ddeca474660143b32
Ali Saidi [Wed, 17 Jan 2007 18:09:26 +0000 (13:09 -0500)]
Implement reading writing of sync fault status register and address register
--HG--
extra : convert_revision :
c2f60e49683446bcc3afdf911da172de0422b8ad
Ali Saidi [Wed, 17 Jan 2007 00:12:33 +0000 (19:12 -0500)]
In the case that we generate a fault (e.g. a tlb miss) on a microcoded instruction set curMacroStaticInst to null
This way we'll jump immediately to the handler
--HG--
extra : convert_revision :
36218d3a5c2342337e66e1229ea2219533efd41e
Ali Saidi [Wed, 17 Jan 2007 00:09:27 +0000 (19:09 -0500)]
Don't add symbols for loaded files to symbol table since they are pretty much meaningless with all the copying that goes on
--HG--
extra : convert_revision :
4d2c1bb72c0344d78d9c3d5958feb3de247102a0
Ali Saidi [Wed, 17 Jan 2007 00:08:21 +0000 (19:08 -0500)]
Fix legion lock code a bit so that if we jump out of a micro coded instruction (because of a fault on the first op) we don't lose sync with legion
Only print TLB if there is a tlb difference
--HG--
extra : convert_revision :
f3baf667ca466d6b8efcaccd186ecec14498229d
Ali Saidi [Wed, 17 Jan 2007 00:06:33 +0000 (19:06 -0500)]
In the case of ASI_P or ASI_LDTX_P set primary and skip the other checks
--HG--
extra : convert_revision :
e7b21c56eadf4603ab03364741b00c9689492423
Ali Saidi [Wed, 17 Jan 2007 00:06:05 +0000 (19:06 -0500)]
Modify ISA and staticInst to support a IsFirstMicroOp flag
Increment instruction count on first micro-op instead of last
src/arch/sparc/isa/decoder.isa:
Implement a twin load for ASI_LDTX_P(0xe2)
src/arch/sparc/isa/formats/mem/blockmem.isa:
set the new flag IsFirstMicroOp when needed
src/cpu/simple/atomic.cc:
Increment instruction count on first micro-op instead of last (because if we take a fault on a micro coded instruction it should be counted twice acording to legion)
src/cpu/static_inst.hh:
Add IsFirstMicroop flag to static insts
--HG--
extra : convert_revision :
02bea93d38c03bbafe4570665eb4c01c11caa2fc
Lisa Hsu [Thu, 11 Jan 2007 14:48:15 +0000 (09:48 -0500)]
Merge zed.eecs.umich.edu:/z/hsul/work/sparc/ali.m5
into zed.eecs.umich.edu:/z/hsul/work/sparc/m5
src/arch/sparc/ua2005.cc:
hand merge between ali and me.
--HG--
extra : convert_revision :
810d63fb484ab26fc30f8130ef32390ba149b267
Lisa Hsu [Thu, 11 Jan 2007 14:41:34 +0000 (09:41 -0500)]
ua2005.cc:
formatting/indentation for case statements
src/arch/sparc/ua2005.cc:
formatting/indentation for case statements
--HG--
extra : convert_revision :
aeb7d0274d8d22db3fa56aabbb8ab8f5371a32ff
Lisa Hsu [Thu, 11 Jan 2007 14:29:03 +0000 (09:29 -0500)]
ua2005.cc:
i SWEAR i committed this already, but apparently i didnt. ust start using HPSTATE::hpriv, etc. to access bitfields.
src/arch/sparc/ua2005.cc:
i SWEAR i committed this already, but apparently i didnt. ust start using HPSTATE::hpriv, etc. to access bitfields.
--HG--
extra : convert_revision :
e66fac9c63088c0fc1a62bd0fac92df305beadff
Lisa Hsu [Thu, 11 Jan 2007 14:18:31 +0000 (09:18 -0500)]
Add Trap Level Zero to interrupts, remove some unreachable code that I forgot to remove last time.
--HG--
extra : convert_revision :
74c4c4591be5a66c21077a6fc5f3f60b0ee9bcc1
Ali Saidi [Thu, 11 Jan 2007 03:19:13 +0000 (22:19 -0500)]
bug fixes to get us to 145m instructions
src/arch/sparc/intregfile.cc:
some checks to make sure that the cwp and global register flattening stuff is working. These things have caught a couple of bugs so I think it would be good to keep them around at least for now
src/arch/sparc/isa/decoder.isa:
fix smul instruction to write Y correctly
src/arch/sparc/miscregfile.cc:
legion always returns du and dl set, so we need to emulate that for now at least
--HG--
extra : convert_revision :
82f9276340888f1e43071c69504486efdcfdb3a8
Ali Saidi [Wed, 10 Jan 2007 03:20:38 +0000 (22:20 -0500)]
quiet/remove some warnings
fix implementation of cwp manipulation
implement PS0 and PS1 IMMU asis
src/arch/sparc/miscregfile.cc:
get rid of some warnings
fix implementation of setting cwp to saturate cwp since it appears the os sets it to a large value to see how many there actually are
src/arch/sparc/tlb.cc:
implement PS0 and PS1 IMMU access ASIs
src/arch/sparc/ua2005.cc:
make warning less verbose
--HG--
extra : convert_revision :
442b65dfc41ebc32b2ef0e6b80da94eee3be9cd3
Ali Saidi [Wed, 10 Jan 2007 03:16:49 +0000 (22:16 -0500)]
add memory mapped disk device
configs/common/FSConfig.py:
src/python/m5/objects/T1000.py:
add configuration for memory mapped disk
src/dev/sparc/SConscript:
add memory mapped disk to sconscript
--HG--
extra : convert_revision :
d8df4a455cf48000042d0ff93a274985f4dbe905
Lisa Hsu [Tue, 9 Jan 2007 01:50:45 +0000 (20:50 -0500)]
pagetable.hh:
small fix so ALPHA_FS will build on macs
interrupts.hh:
small fix for alpha compile
src/arch/alpha/interrupts.hh:
small fix for alpha compile
src/arch/alpha/pagetable.hh:
small fix so ALPHA_FS will build on macs
--HG--
extra : convert_revision :
5fdbc68caa706d652b51807ac8f6bf58bcf72bdc
Lisa Hsu [Mon, 8 Jan 2007 23:18:28 +0000 (18:18 -0500)]
the way i understand it, interrupts in m5 is a little bloated. the usage of CPU->checkInterrupts bool is inconsistent, and i think should eventually be phased out. For now, I've just assumed that CPU->checkInterrupts() is the way to fast path a CPU if you have no interrupts by having a simple bitfield in each ISA to determine whether interrupts are pending. getInterrupts has been mostly filled in.
src/arch/sparc/interrupts.hh:
fill in how we do interrupts on sparc a little bit.
1) create a bitfield for interrupts, and check that in checkInterrupts() to fast path CPU.
2) fill in getInterrupts() a little bit.
also, update the bitfield access to be HPSTATE::hpriv, etc.
src/arch/sparc/ua2005.cc:
1) update formatting
2) change the way interrupts are done to use the new way to tickle the CPU.
src/cpu/base.cc:
src/cpu/base.hh:
overload the post_interrupt function for SPARC interrupts - which are only denoted by a single int value.
--HG--
extra : convert_revision :
9074a003eff37a40dcce78f56d20f6cbcc453eb5
Lisa Hsu [Mon, 8 Jan 2007 23:07:17 +0000 (18:07 -0500)]
some formatting changes, and update how I do bitfields for HPSTATE and PSTATE to avoid name confusion.
src/arch/sparc/faults.cc:
1) s/Resumeable/Resumable/gc
2) s/if(/if (/gc
3) keep variables lowercase
4) change the way fields are accessed - instead of hard coding bitvectors, use masks (like HPSTATE::hpriv).
src/arch/sparc/faults.hh:
s/Resumeable/Resumable/
src/arch/sparc/isa_traits.hh:
This is unused and unnecessary.
src/arch/sparc/miscregfile.hh:
add bitfield masks for some important ASRs (HPSTATE, PSTATE).
--HG--
extra : convert_revision :
f0ffaf48de298758685266dfb90f43aff42e0a2c
Ali Saidi [Mon, 8 Jan 2007 22:11:10 +0000 (17:11 -0500)]
change when legion-lock causes the simulation to die. It now happens after two consuctive differences since we compare stuff
at slightly different times interrupts are seen the cycle before they happen in m5 so the pc gets changed early.
--HG--
extra : convert_revision :
f237363eababb2aad67e5b41670cf40be048a042
Ali Saidi [Mon, 8 Jan 2007 22:09:48 +0000 (17:09 -0500)]
fix softint and partially implement hstick interrupts need to figure out how to do the acutal interrupting still
src/arch/sparc/miscregfile.cc:
fix softint and fprs in miscregfile
--HG--
extra : convert_revision :
cf98bd9c172e20f328f18e07dd05f63f37f14c87
Ali Saidi [Fri, 5 Jan 2007 20:04:17 +0000 (15:04 -0500)]
set the softint appropriately on an timer compare interrupt
there is no interrupt_level_0 interrupt, so start the list at 0x40 so the adding is done correctly
src/arch/sparc/faults.cc:
there is no interrupt_level_0 interrupt, so start the list at 0x40 so the adding is done correctly
src/arch/sparc/faults.hh:
correct protection defines
src/arch/sparc/ua2005.cc:
set the softint appropriately on an timer compare interrupt
--HG--
extra : convert_revision :
f41c10ec78db973b3f856c70b58a17f83b60bbe2