From 4605b616c1f09d56e3452c2af1ef918e340a74a0 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Tue, 24 May 2016 16:26:07 -0700
Subject: [PATCH] Fix bug in D$ AMO/storegen logic

---
 rocket/src/main/scala/dcache.scala | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rocket/src/main/scala/dcache.scala b/rocket/src/main/scala/dcache.scala
index df089d4f..fa32995c 100644
--- a/rocket/src/main/scala/dcache.scala
+++ b/rocket/src/main/scala/dcache.scala
@@ -387,9 +387,9 @@ class DCache(implicit p: Parameters) extends L1HellaCacheModule()(p) {
   // AMOs
   if (usingAtomics) {
     val amoalu = Module(new AMOALU)
-    amoalu.io.addr := s2_req.addr
-    amoalu.io.cmd := s2_req.cmd
-    amoalu.io.typ := s2_req.typ
+    amoalu.io.addr := pstore1_addr
+    amoalu.io.cmd := pstore1_cmd
+    amoalu.io.typ := pstore1_typ
     amoalu.io.lhs := s2_data_word
     amoalu.io.rhs := pstore1_data
     pstore1_storegen_data := amoalu.io.out