Yu-hsin Wang has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/45325 )

Change subject: dev: use smart pointer to hold ArmInterruptPin
......................................................................

dev: use smart pointer to hold ArmInterruptPin

Change-Id: I848fda7f953f8ce7abb1d7f8a397e6c10bd15142
---
M src/dev/arm/base_gic.cc
M src/dev/arm/base_gic.hh
2 files changed, 12 insertions(+), 13 deletions(-)



diff --git a/src/dev/arm/base_gic.cc b/src/dev/arm/base_gic.cc
index 81f4f51..a5521ba 100644
--- a/src/dev/arm/base_gic.cc
+++ b/src/dev/arm/base_gic.cc
@@ -89,7 +89,7 @@
 ArmInterruptPin*
 ArmSPIGen::get(ThreadContext* tc)
 {
-    return pin;
+    return pin.get();
 }

 ArmPPIGen::ArmPPIGen(const ArmPPIParams &p)
@@ -105,17 +105,16 @@

     auto pin_it = pins.find(cid);

-    if (pin_it != pins.end()) {
+    if (pin_it != pins.end())
         // PPI Pin Already generated
-        return pin_it->second;
-    } else {
-        // Generate PPI Pin
-        ArmPPI *pin = new ArmPPI(ArmPPIGen::params(), tc);
+        return pin_it->second.get();

-        pins.insert({cid, pin});
+    // Generate PPI Pin
+    ArmPPI *pin = new ArmPPI(ArmPPIGen::params(), tc);

-        return pin;
-    }
+    pins.emplace(cid, pin);
+
+    return pin;
 }

ArmSigInterruptPinGen::ArmSigInterruptPinGen(const ArmSigInterruptPinParams &p)
@@ -125,7 +124,7 @@
 ArmInterruptPin*
 ArmSigInterruptPinGen::get(ThreadContext* tc)
 {
-    return pin;
+    return pin.get();
 }

 Port &
diff --git a/src/dev/arm/base_gic.hh b/src/dev/arm/base_gic.hh
index aee433f..0c8d159 100644
--- a/src/dev/arm/base_gic.hh
+++ b/src/dev/arm/base_gic.hh
@@ -159,7 +159,7 @@

     ArmInterruptPin* get(ThreadContext *tc = nullptr) override;
   protected:
-    ArmSPI* pin;
+    std::unique_ptr<ArmSPI> pin;
 };

 /**
@@ -175,7 +175,7 @@

     ArmInterruptPin* get(ThreadContext* tc = nullptr) override;
   protected:
-    std::unordered_map<ContextID, ArmPPI*> pins;
+    std::unordered_map<ContextID, std::unique_ptr<ArmPPI>> pins;
 };

 class ArmSigInterruptPinGen : public ArmInterruptPinGen
@@ -191,7 +191,7 @@
                   PortID idx = InvalidPortID) override;

   protected:
-    ArmSigInterruptPin* pin;
+    std::unique_ptr<ArmSigInterruptPin> pin;
 };

 /**

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45325
To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I848fda7f953f8ce7abb1d7f8a397e6c10bd15142
Gerrit-Change-Number: 45325
Gerrit-PatchSet: 1
Gerrit-Owner: Yu-hsin Wang <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s

Reply via email to