commit fb2f99cb6c85ad81e782487eea586ad92e16786f
author Gabe Black <gabe.black@gmail.com> Fri Dec 03 18:15:34 2021 -0800
committer Gabe Black <gabe.black@gmail.com> Sat Dec 04 07:44:13 2021 +0000
tree 6a5b25a69f33cf030485ac3f58d0b04c9c59feb2
parent b65272e7f1ec24b57d92b28bd2c0c24e5f9a6325

cpu-minor: Get rid of the MinorDynInst::init function.

Just initialize the global MinorDynInst::bubbleInst with a lambda to
avoid having a init() function somebody needs to remember to call, and
which needs to only be called once (or which should only do something
once).

Change-Id: Ied6397e52ccefd6e6bdca012a01f004a47d6f26e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/53583
Maintainer: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

src/cpu/minor/cpu.cc

diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc
index cd9a11a..b8e9711 100644
--- a/src/cpu/minor/cpu.cc
+++ b/src/cpu/minor/cpu.cc
@@ -76,8 +76,6 @@
         fatal("The Minor model doesn't support checking (yet)\n");
     }
 
-    minor::MinorDynInst::init();
-
     pipeline = new minor::Pipeline(*this, params);
     activityRecorder = pipeline->getActivityRecorder();
 

src/cpu/minor/dyn_inst.cc

diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index 8a07647..dfff813 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -77,18 +77,13 @@
     return os;
 }
 
-MinorDynInstPtr MinorDynInst::bubbleInst = NULL;
-
-void
-MinorDynInst::init()
-{
-    if (!bubbleInst) {
-        bubbleInst = new MinorDynInst(nullStaticInstPtr);
-        assert(bubbleInst->isBubble());
-        /* Make bubbleInst immortal */
-        bubbleInst->incref();
-    }
-}
+MinorDynInstPtr MinorDynInst::bubbleInst = []() {
+    auto *inst = new MinorDynInst(nullStaticInstPtr);
+    assert(inst->isBubble());
+    // Make bubbleInst immortal.
+    inst->incref();
+    return inst;
+}();
 
 bool
 MinorDynInst::isLastOpInInst() const

src/cpu/minor/dyn_inst.hh

diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh
index 96a1649..ec986cd 100644
--- a/src/cpu/minor/dyn_inst.hh
+++ b/src/cpu/minor/dyn_inst.hh
@@ -267,9 +267,6 @@
      *  a whole instruction or the last microop from a macroop */
     bool isLastOpInInst() const;
 
-    /** Initialise the class */
-    static void init();
-
     /** Print (possibly verbose) instruction information for
      *  MinorTrace using the given Named object's name */
     void minorTraceInst(const Named &named_object,