stats: update SPARC FS stats

The fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic test was
broken for so long that, now that it's working again, the stats
output is out of date.  This changeset updates the outputs, on
the assumption that the stats changes are all valid differences
due to other changes made while it was broken.

1 files changed, 21 insertions, 17 deletions

diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
index feb4be957..d144b080a 100644
--- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
+++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
@@ -473,8 +473,9 @@
                 "ret_data16": 65535
             }
         }, 
+        "partition_desc_addr": 133445976064, 
         "symbolfile": "", 
-        "readfile": "/scratch/nilay/GEM5/gem5/tests/halt.sh", 
+        "readfile": "/z/stever/hg/gem5/tests/halt.sh", 
         "hypervisor_addr": 1099243257856, 
         "mem_ranges": [
             "1048576:68157439", 
@@ -482,7 +483,7 @@
         ], 
         "cxx_class": "SparcSystem", 
         "load_offset": 0, 
-        "reset_bin": "/scratch/nilay/GEM5/system/binaries/reset_new.bin", 
+        "reset_bin": "/dist/m5/system/binaries/reset_new.bin", 
         "openboot_addr": 1099243716608, 
         "work_end_ckpt_count": 0, 
         "nvram_addr": 133429198848, 
@@ -645,8 +646,8 @@
             "type": "DVFSHandler"
         }, 
         "work_end_exit_count": 0, 
-        "hypervisor_desc_bin": "/scratch/nilay/GEM5/system/binaries/1up-hv.bin", 
-        "openboot_bin": "/scratch/nilay/GEM5/system/binaries/openboot_new.bin", 
+        "hypervisor_desc_bin": "/dist/m5/system/binaries/1up-hv.bin", 
+        "openboot_bin": "/dist/m5/system/binaries/openboot_new.bin", 
         "voltage_domain": {
             "name": "voltage_domain", 
             "eventq_index": 0, 
@@ -706,7 +707,7 @@
         "work_cpus_ckpt_count": 0, 
         "work_begin_exit_count": 0, 
         "path": "system", 
-        "hypervisor_bin": "/scratch/nilay/GEM5/system/binaries/q_new.bin", 
+        "hypervisor_bin": "/dist/m5/system/binaries/q_new.bin", 
         "cpu_clk_domain": {
             "name": "cpu_clk_domain", 
             "clock": [
@@ -720,12 +721,12 @@
             "type": "SrcClockDomain", 
             "domain_id": -1
         }, 
-        "nvram_bin": "/scratch/nilay/GEM5/system/binaries/nvram1", 
+        "nvram_bin": "/dist/m5/system/binaries/nvram1", 
         "mem_mode": "atomic", 
         "name": "system", 
         "init_param": 0, 
         "type": "SparcSystem", 
-        "partition_desc_bin": "/scratch/nilay/GEM5/system/binaries/1up-md.bin", 
+        "partition_desc_bin": "/dist/m5/system/binaries/1up-md.bin", 
         "load_addr_mask": 1099511627775, 
         "cpu": {
             "do_statistics_insts": true, 
@@ -758,13 +759,15 @@
                 "peer": "system.membus.slave[1]", 
                 "role": "MASTER"
             }, 
-            "interrupts": {
-                "eventq_index": 0, 
-                "path": "system.cpu.interrupts", 
-                "type": "SparcInterrupts", 
-                "name": "interrupts", 
-                "cxx_class": "SparcISA::Interrupts"
-            }, 
+            "interrupts": [
+                {
+                    "eventq_index": 0, 
+                    "path": "system.cpu.interrupts", 
+                    "type": "SparcInterrupts", 
+                    "name": "interrupts", 
+                    "cxx_class": "SparcISA::Interrupts"
+                }
+            ], 
             "dcache_port": {
                 "peer": "system.membus.slave[2]", 
                 "role": "MASTER"
@@ -831,7 +834,7 @@
                     "eventq_index": 0, 
                     "cxx_class": "RawDiskImage", 
                     "path": "system.disk0.image.child", 
-                    "image_file": "/scratch/nilay/GEM5/system/disks/disk.s10hw2", 
+                    "image_file": "/dist/m5/system/disks/disk.s10hw2", 
                     "type": "RawDiskImage"
                 }, 
                 "path": "system.disk0.image", 
@@ -848,11 +851,12 @@
             "pio_addr": 134217728000, 
             "type": "MmDisk"
         }, 
+        "multi_thread": false, 
         "reset_addr": 1099243192320, 
         "hypervisor_desc_addr": 133446500352, 
-        "partition_desc_addr": 133445976064, 
+        "num_work_ids": 16, 
         "work_item_id": -1, 
-        "num_work_ids": 16
+        "exit_on_work_items": false
     }, 
     "time_sync_period": 200000000, 
     "eventq_index": 0,