More conversions of ref-counted parameters to references:

Statistics::NodePtr, StaticInstPtr, ethernet PacketPtr.

base/statistics.hh:
    Change NodePtr parameters to Nodeptr &.
cpu/exetrace.hh:
    Change StaticInstPtr parameters to StaticInstPtr &.
dev/etherbus.cc:
dev/etherbus.hh:
dev/etherdump.cc:
dev/etherdump.hh:
dev/etherint.hh:
dev/etherlink.cc:
dev/etherlink.hh:
dev/ethertap.cc:
dev/ethertap.hh:
    change PacketPtr parameters to PacketPtr &.

--HG--
extra : convert_revision : a778efdca33b0ec5beb76cf47db0e9e4728897ee

diff --git a/base/statistics.hh b/base/statistics.hh
index ce20043a32618c30c1f41af38ea88c2f148e4798..cbc976053ae830ad249066c7eed83437e6db83ca 100644 (file)
--- a/base/statistics.hh
+++ b/base/statistics.hh
@@ -2067,7 +2067,7 @@ class UnaryNode : public Node
     mutable rvec_t result;
 
   public:
-    UnaryNode(NodePtr p) : l(p) {}
+    UnaryNode(NodePtr &p) : l(p) {}
 
     const rvec_t &val() const {
         const rvec_t &lvec = l->val();
@@ -2110,7 +2110,7 @@ class BinaryNode : public Node
     mutable rvec_t result;
 
   public:
-    BinaryNode(NodePtr a, NodePtr b) : l(a), r(b) {}
+    BinaryNode(NodePtr &a, NodePtr &b) : l(a), r(b) {}
 
     const rvec_t &val() const {
         Op op;
@@ -2179,7 +2179,7 @@ class SumNode : public Node
     mutable rvec_t result;
 
   public:
-    SumNode(NodePtr p) : l(p), result(1) {}
+    SumNode(NodePtr &p) : l(p), result(1) {}
 
     const rvec_t &val() const {
         const rvec_t &lvec = l->val();
@@ -2999,7 +2999,7 @@ class Temp
      * Return the node pointer.
      * @return the node pointer.
      */
-    operator NodePtr() { return node;}
+    operator NodePtr&() { return node;}
 
   public:
     /**

diff --git a/cpu/exetrace.hh b/cpu/exetrace.hh
index d05dbe0cd748777bd029814944aefcc02f696a41..622ecd7296b81f3f9c4e26a66c5b89ebf2eadb7d 100644 (file)
--- a/cpu/exetrace.hh
+++ b/cpu/exetrace.hh
@@ -91,8 +91,9 @@ class InstRecord : public Record
     bool regs_valid;
 
   public:
-    InstRecord(Tick _cycle, BaseCPU *_cpu, StaticInstPtr<TheISA> _staticInst,
-               Addr _pc, bool spec, unsigned _thread)
+    InstRecord(Tick _cycle, BaseCPU *_cpu,
+               const StaticInstPtr<TheISA> &_staticInst,
+               Addr _pc, bool spec, int _thread)
         : Record(_cycle), cpu(_cpu), staticInst(_staticInst), PC(_pc),
           misspeculating(spec), thread(_thread)
     {

diff --git a/dev/etherbus.cc b/dev/etherbus.cc
index 3f6036f72ae10d6f4f9b72f2b2c0fe64c456f7cf..76697dd3e4ff7fa5db9a8fe385103fcc3263cee0 100644 (file)
--- a/dev/etherbus.cc
+++ b/dev/etherbus.cc
@@ -81,7 +81,7 @@ EtherBus::reg(EtherInt *dev)
 { devlist.push_back(dev); }
 
 bool
-EtherBus::send(EtherInt *sndr, PacketPtr pkt)
+EtherBus::send(EtherInt *sndr, PacketPtr &pkt)
 {
     if (busy()) {
         DPRINTF(Ethernet, "ethernet packet not sent, bus busy\n", curTick);

diff --git a/dev/etherbus.hh b/dev/etherbus.hh
index f7f6333038e48561b7c23c828e29e611ed660618..9ef47780811bfb649773dc622ec71b04709d4d7e 100644 (file)
--- a/dev/etherbus.hh
+++ b/dev/etherbus.hh
@@ -73,7 +73,7 @@ class EtherBus : public SimObject
     void txDone();
     void reg(EtherInt *dev);
     bool busy() const { return (bool)packet; }
-    bool send(EtherInt *sender, PacketPtr packet);
+    bool send(EtherInt *sender, PacketPtr &packet);
 };
 
 #endif // __ETHERBUS_H__

diff --git a/dev/etherdump.cc b/dev/etherdump.cc
index 89f1ce382c825b5e6403215996ede3d0b5eead6e..6d86adc324213724d565eeb971270be7f8f5271a 100644 (file)
--- a/dev/etherdump.cc
+++ b/dev/etherdump.cc
@@ -106,7 +106,7 @@ EtherDump::init()
 }
 
 void
-EtherDump::dumpPacket(PacketPtr packet)
+EtherDump::dumpPacket(PacketPtr &packet)
 {
     pcap_pkthdr pkthdr;
     pkthdr.ts.tv_sec = curtime + (curTick / s_freq);

diff --git a/dev/etherdump.hh b/dev/etherdump.hh
index b3aefeb741aac589fa90201c88af9a28837cc865..e22b661663a72800ee9f6ba74615b961871154da 100644 (file)
--- a/dev/etherdump.hh
+++ b/dev/etherdump.hh
@@ -44,7 +44,7 @@ class EtherDump : public SimObject
 {
   private:
     std::ofstream stream;
-    void dumpPacket(PacketPtr packet);
+    void dumpPacket(PacketPtr &packet);
     void init();
 
     Tick curtime;
@@ -54,7 +54,7 @@ class EtherDump : public SimObject
   public:
     EtherDump(const std::string &name, const std::string &file);
 
-    inline void dump(PacketPtr pkt) { if (stream.is_open()) dumpPacket(pkt); }
+    inline void dump(PacketPtr &pkt) { if (stream.is_open()) dumpPacket(pkt); }
 };
 
 #endif // __ETHERDUMP_H__

diff --git a/dev/etherint.hh b/dev/etherint.hh
index dfc9f6fd6350ed62329860a244797ca512370366..70e29eb7c3d2d325f2f8785a5ca007c4200a4a11 100644 (file)
--- a/dev/etherint.hh
+++ b/dev/etherint.hh
@@ -54,9 +54,9 @@ class EtherInt : public SimObject
     virtual ~EtherInt() {}
 
     void setPeer(EtherInt *p);
-    virtual bool recvPacket(PacketPtr packet) = 0;
+    virtual bool recvPacket(PacketPtr &packet) = 0;
     void recvDone() { peer->sendDone(); }
-    bool sendPacket(PacketPtr packet)
+    bool sendPacket(PacketPtr &packet)
     {
         return peer ? peer->recvPacket(packet) : true;
     }

diff --git a/dev/etherlink.cc b/dev/etherlink.cc
index c042cac34f2a418caca1561b813a71dd05acb471..676b1da1c6f3d873cfb14aa5b2b70bc6d140ff6c 100644 (file)
--- a/dev/etherlink.cc
+++ b/dev/etherlink.cc
@@ -102,7 +102,7 @@ EtherLink::Link::txDone()
 }
 
 bool
-EtherLink::Link::transmit(PacketPtr pkt)
+EtherLink::Link::transmit(PacketPtr &pkt)
 {
     if (busy()) {
         DPRINTF(Ethernet, "EtherLink packet not sent, link busy\n");

diff --git a/dev/etherlink.hh b/dev/etherlink.hh
index ef587faf72d86b74da0a7149c5a63f2428a71113..895bac2e1e730ca9fcce846d02303c4e6a82047d 100644 (file)
--- a/dev/etherlink.hh
+++ b/dev/etherlink.hh
@@ -92,7 +92,7 @@ class EtherLink : public SimObject
         virtual std::string name() const { return objName; }
 
         bool busy() const { return (bool)packet; }
-        bool transmit(PacketPtr packet);
+        bool transmit(PacketPtr &packet);
 
         void setTxInt(Interface *i) { assert(!txint); txint = i; }
         void setRxInt(Interface *i) { assert(!rxint); rxint = i; }
@@ -108,7 +108,7 @@ class EtherLink : public SimObject
 
       public:
         Interface(const std::string &name, Link *txlink, Link *rxlink);
-        bool recvPacket(PacketPtr packet) { return txlink->transmit(packet); }
+        bool recvPacket(PacketPtr &packet) { return txlink->transmit(packet); }
         void sendDone() { }
     };
 

diff --git a/dev/ethertap.cc b/dev/ethertap.cc
index 339e7ac78beb22d614b8c2f175dea83ba04eaaf4..960d21d730329e7ce9a7b5dee6d2db6f10f0f0ca 100644 (file)
--- a/dev/ethertap.cc
+++ b/dev/ethertap.cc
@@ -169,7 +169,7 @@ EtherTap::detach()
 }
 
 bool
-EtherTap::recvPacket(PacketPtr packet)
+EtherTap::recvPacket(PacketPtr &packet)
 {
     if (dump)
         dump->dump(packet);

diff --git a/dev/ethertap.hh b/dev/ethertap.hh
index e2b1f640fb57b35b40f00fd0fe7ddf4e8b67580e..0b853a11d93af2c548103bd423eda4e7df75fbed 100644 (file)
--- a/dev/ethertap.hh
+++ b/dev/ethertap.hh
@@ -94,7 +94,7 @@ class EtherTap : public EtherInt
     EtherTap(const std::string &name, EtherDump *dump, int port, int bufsz);
     virtual ~EtherTap();
 
-    virtual bool recvPacket(PacketPtr packet);
+    virtual bool recvPacket(PacketPtr &packet);
     virtual void sendDone();
 
     virtual void serialize(std::ostream &os);