From dfc13236d1a140d7ccb9450a8bfe2876c3cb4ea1 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@eecs.berkeley.edu>
Date: Thu, 16 Jan 2014 12:44:29 -0800
Subject: [PATCH] Linux works again!

---
 chisel           | 2 +-
 csrc/emulator.cc | 6 +++---
 riscv-tests      | 2 +-
 riscv-tools      | 2 +-
 rocket           | 2 +-
 uncore           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chisel b/chisel
index 22ab4efe..ae1d1de8 160000
--- a/chisel
+++ b/chisel
@@ -1 +1 @@
-Subproject commit 22ab4efe5878b0d6eb324b820ef8cea381698efd
+Subproject commit ae1d1de82188f0a1d79a4e8eb613743942a13eb3
diff --git a/csrc/emulator.cc b/csrc/emulator.cc
index 587036b9..19d9fe92 100644
--- a/csrc/emulator.cc
+++ b/csrc/emulator.cc
@@ -94,7 +94,7 @@ int main(int argc, char** argv)
     tile.Top__io_mem_req_data_ready = LIT<1>(mm->req_data_ready());
     tile.Top__io_mem_resp_valid = LIT<1>(mm->resp_valid());
     tile.Top__io_mem_resp_bits_tag = LIT<64>(mm->resp_tag());
-    memcpy(&tile.Top__io_mem_resp_bits_data, mm->resp_data(), tile.Top__io_mem_resp_bits_data.width()/8);
+    memcpy(tile.Top__io_mem_resp_bits_data.values, mm->resp_data(), tile.Top__io_mem_resp_bits_data.width()/8);
 
     tile.clock_lo(LIT<1>(0));
 
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
       tile.Top__io_mem_req_cmd_bits_tag.lo_word(),
 
       tile.Top__io_mem_req_data_valid.lo_word(),
-      &tile.Top__io_mem_req_data_bits_data.values[0],
+      tile.Top__io_mem_req_data_bits_data.values,
 
       tile.Top__io_mem_resp_ready.to_bool()
     );
@@ -120,7 +120,7 @@ int main(int argc, char** argv)
       tile.Top__io_host_in_bits = LIT<64>(htif_in_bits);
 
       if (tile.Top__io_host_out_valid.to_bool())
-        htif->send(&tile.Top__io_host_out_bits.values[0], htif_bits/8);
+        htif->send(tile.Top__io_host_out_bits.values, htif_bits/8);
       tile.Top__io_host_out_ready = LIT<1>(1);
     }
 
diff --git a/riscv-tests b/riscv-tests
index b374fd10..d710b4ba 160000
--- a/riscv-tests
+++ b/riscv-tests
@@ -1 +1 @@
-Subproject commit b374fd10b2b36124bb6813211a7ec690e1fa8350
+Subproject commit d710b4ba5d3405a338d133f77f5d19bd12a4e8b7
diff --git a/riscv-tools b/riscv-tools
index 20ff67d5..fb38473b 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit 20ff67d56c3b505b99e531d48954c2c292a2fa99
+Subproject commit fb38473be6f843cc492e03a0669ed60df7d05c5c
diff --git a/rocket b/rocket
index 6554ed32..2249bbfb 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 6554ed321ceef75af96aeab6a4d8a2b9d90c0d1d
+Subproject commit 2249bbfbdebdd6f2a02c34793024332a08c9167d
diff --git a/uncore b/uncore
index 2a21e843..a5826575 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 2a21e8435a0b58ca588bfda0ab11b54e08efe3bd
+Subproject commit a58265755fcb90aebe5377cb9b7343732fd14b9a