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

1 files changed, 125 insertions, 25 deletions

diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
index 1254e9fec..673f2c89c 100644
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
+++ b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
@@ -10,6 +10,7 @@ type=PhysicalMemory
 file=
 range=[0,134217727]
 latency=1
+zero=false
 
 [system]
 type=LinuxAlphaSystem
@@ -57,6 +58,7 @@ do_quiesce=true
 do_checkpoint_insts=true
 do_statistics_insts=true
 clock=1
+phase=0
 defer_registration=false
 width=1
 function_trace=false
@@ -78,7 +80,12 @@ pio_addr=0
 pio_latency=0
 pio_size=8
 ret_bad_addr=true
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -141,7 +148,12 @@ pio_addr=8804615848696
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -151,7 +163,12 @@ pio_addr=8804615848936
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -161,7 +178,12 @@ pio_addr=8804615848680
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -171,17 +193,27 @@ pio_addr=8804615848944
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
 [system.tsunami.fake_ppc]
 type=IsaFake
-pio_addr=8804615848892
+pio_addr=8804615848891
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -200,7 +232,8 @@ pio_latency=2
 frequency=1953125
 platform=system.tsunami
 system=system
-time=1136073600
+time=2009 1 1 0 0 0 3 1
+year_is_bcd=false
 tsunami=system.tsunami
 
 []
@@ -239,7 +272,12 @@ pio_addr=8804615848304
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -249,7 +287,12 @@ pio_addr=8804615848432
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -267,7 +310,12 @@ pio_addr=8804615848643
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -277,7 +325,12 @@ pio_addr=8804615848579
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -287,7 +340,12 @@ pio_addr=8804615848515
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -297,7 +355,12 @@ pio_addr=8804615848451
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -307,7 +370,12 @@ pio_addr=8804615848899
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -317,7 +385,12 @@ pio_addr=8804615848835
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -327,7 +400,12 @@ pio_addr=8804615848771
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -337,7 +415,12 @@ pio_addr=8804615848707
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -347,7 +430,12 @@ pio_addr=8804615850617
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -434,7 +522,12 @@ pio_addr=8796093677568
 pio_latency=2
 pio_size=393216
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -452,7 +545,12 @@ pio_addr=8804615848816
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -462,7 +560,12 @@ pio_addr=8804615848569
 pio_latency=2
 pio_size=8
 ret_bad_addr=false
-ret_data=255
+update_data=false
+warn_access=
+ret_data8=255
+ret_data16=65535
+ret_data32=4294967295
+ret_data64=18446744073709551615
 platform=system.tsunami
 system=system
 
@@ -565,9 +668,6 @@ intel_format=false
 legion_lockstep=false
 trace_system=client
 
-[debug]
-break_cycles=
-
 [statsreset]
 reset_cycle=0