Merge zeep.pool:/z/saidi/work/m5.head

into  zeep.pool:/z/saidi/work/m5.nm_m5_pull

SConscript:
    dram memory needs to be converted to newmem before we can use it
dev/ide_ctrl.cc:
    don't need this printing in newmem
dev/ide_disk.cc:
    will read stats in next commit
dev/sinic.cc:
    merge sinic from head, still needs work

--HG--
extra : convert_revision : b9aabd8c7814d07d54ce6f971aad3ec349fa24e1

1 files changed, 14 insertions, 0 deletions

diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh
index 3d67abece..891c462b5 100644
--- a/dev/ide_disk.hh
+++ b/dev/ide_disk.hh
@@ -33,6 +33,7 @@
 #ifndef __IDE_DISK_HH__
 #define __IDE_DISK_HH__
 
+#include "base/statistics.hh"
 #include "dev/disk_image.hh"
 #include "dev/ide_atareg.h"
 #include "dev/ide_ctrl.hh"
@@ -231,6 +232,13 @@ class IdeDisk : public SimObject
     /** Interrupt pending */
     bool intrPending;
 
+    Stats::Scalar<> dmaReadFullPages;
+    Stats::Scalar<> dmaReadBytes;
+    Stats::Scalar<> dmaReadTxs;
+    Stats::Scalar<> dmaWriteFullPages;
+    Stats::Scalar<> dmaWriteBytes;
+    Stats::Scalar<> dmaWriteTxs;
+
   public:
     /**
      * Create and initialize this Disk.
@@ -252,6 +260,12 @@ class IdeDisk : public SimObject
     void reset(int id);
 
     /**
+     * Register statistics.
+     */
+    void regStats();
+
+
+    /**
      * Set the controller for this device
      * @param c The IDE controller
      */