From 952c4f5eead8af33bfbff7c63cb0ebe934ebbc5d Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Fri, 22 Sep 2023 09:01:09 +0100
Subject: [PATCH] cpu: Pass a reference of the parent tracer to the
 ExeTracerRecord

Change-Id: I3576df2b7bee1289db60bb6072bd9c90038ca8ce
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
---
 src/cpu/exetrace.hh    | 21 +++++++++++++++++++--
 src/cpu/nativetrace.cc | 23 +++++++++++++++++++++++
 src/cpu/nativetrace.hh | 26 +++++++++++++++++---------
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/cpu/exetrace.hh b/src/cpu/exetrace.hh
index 143cfa0eb3..3fbeb98bc3 100644
--- a/src/cpu/exetrace.hh
+++ b/src/cpu/exetrace.hh
@@ -1,4 +1,16 @@
 /*
+ * Copyright (c) 2023 Arm Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
  * Copyright (c) 2001-2005 The Regents of The University of Michigan
  * All rights reserved.
  *
@@ -49,14 +61,19 @@ class ExeTracerRecord : public InstRecord
   public:
     ExeTracerRecord(Tick _when, ThreadContext *_thread,
                const StaticInstPtr _staticInst, const PCStateBase &_pc,
+               const ExeTracer &_tracer,
                const StaticInstPtr _macroStaticInst = NULL)
-        : InstRecord(_when, _thread, _staticInst, _pc, _macroStaticInst)
+        : InstRecord(_when, _thread, _staticInst, _pc, _macroStaticInst),
+          tracer(_tracer)
     {
     }
 
     void traceInst(const StaticInstPtr &inst, bool ran);
 
     void dump();
+
+  protected:
+    const ExeTracer &tracer;
 };
 
 class ExeTracer : public InstTracer
@@ -75,7 +92,7 @@ class ExeTracer : public InstTracer
             return NULL;
 
         return new ExeTracerRecord(when, tc,
-                staticInst, pc, macroStaticInst);
+                staticInst, pc, *this, macroStaticInst);
     }
 };
 
diff --git a/src/cpu/nativetrace.cc b/src/cpu/nativetrace.cc
index 3070205b9f..60efc791de 100644
--- a/src/cpu/nativetrace.cc
+++ b/src/cpu/nativetrace.cc
@@ -1,4 +1,16 @@
 /*
+ * Copyright (c) 2023 Arm Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
  * Copyright (c) 2006-2009 The Regents of The University of Michigan
  * All rights reserved.
  *
@@ -49,6 +61,17 @@ NativeTrace::NativeTrace(const Params &p)
     fd = native_listener->accept();
 }
 
+NativeTraceRecord::NativeTraceRecord(
+        NativeTrace *_parent,
+        Tick _when, ThreadContext *_thread,
+        const StaticInstPtr _staticInst, const PCStateBase &_pc,
+        const StaticInstPtr _macroStaticInst)
+  : ExeTracerRecord(_when, _thread, _staticInst, _pc,
+                    *_parent, _macroStaticInst),
+    parent(_parent)
+{
+}
+
 void
 NativeTraceRecord::dump()
 {
diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh
index a19acaca3f..a0866e130f 100644
--- a/src/cpu/nativetrace.hh
+++ b/src/cpu/nativetrace.hh
@@ -1,4 +1,16 @@
 /*
+ * Copyright (c) 2023 Arm Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
  * Copyright (c) 2006-2009 The Regents of The University of Michigan
  * All rights reserved.
  *
@@ -50,20 +62,16 @@ class NativeTrace;
 
 class NativeTraceRecord : public ExeTracerRecord
 {
-  protected:
-    NativeTrace * parent;
-
   public:
-    NativeTraceRecord(NativeTrace * _parent,
+    NativeTraceRecord(NativeTrace *_parent,
                Tick _when, ThreadContext *_thread,
                const StaticInstPtr _staticInst, const PCStateBase &_pc,
-               const StaticInstPtr _macroStaticInst=nullptr)
-        : ExeTracerRecord(_when, _thread, _staticInst, _pc, _macroStaticInst),
-        parent(_parent)
-    {
-    }
+               const StaticInstPtr _macroStaticInst=nullptr);
 
     void dump();
+
+  private:
+    NativeTrace *parent;
 };
 
 class NativeTrace : public ExeTracer