Merge zizzer:/bk/newmem

into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 3eb1a665cb813df974aa2815a794b459473c0a77

1 files changed, 22 insertions, 15 deletions

diff --git a/mem/request.hh b/mem/request.hh
index 331f76698..31f5b1921 100644
--- a/mem/request.hh
+++ b/mem/request.hh
@@ -37,34 +37,41 @@
 class Request
 {
 
-    /** The virtual address of the request. */
-    Addr vaddr;
     /** The physical address of the request. */
     Addr paddr;
 
-    /** whether this req came from the CPU or not */
-    bool nic_req;
-
-     /** The address space ID. */
-    int asid;
-    /** The related execution context. */
-    ExecContext *xc;
+    /** whether this req came from the CPU or not  **DO we need this??***/
+    bool nicReq;
 
     /** The size of the request. */
     int size;
 
+    /** The time this request was started. Used to calculate latencies. */
+    Tick time;
+
+    /** Destination address if this is a block copy. */
+    Addr copyDest;
+};
+
+class CpuRequest : public Request
+{
+    /** The virtual address of the request. */
+    Addr vaddr;
+
+    /** The address space ID. */
+    int asid;
+
     /** The return value of store conditional. */
-    uint64_t result;
+    uint64_t scResult;
 
     /** The cpu number for statistics. */
-    int cpu_num;
+    int cpuNum;
+
     /** The requesting  thread id. */
-    int  thread_num;
-    /** The time this request was started. Used to calculate latencies. */
-    Tick time;
+    int  threadNum;
 
     /** program counter of initiating access; for tracing/debugging */
     Addr pc;
-}
+};
 
 #endif // __MEM_REQUEST_HH__