From 9b55fb5a698c6fe204808a7621a176994d577e10 Mon Sep 17 00:00:00 2001
From: Tony Gutierrez <anthony.gutierrez@amd.com>
Date: Thu, 2 Jul 2020 13:37:29 -0400
Subject: [PATCH] arch-arm: Remove some unused vars from self_debug.hh

Change-Id: I68b4ddfe66a34a29c0abfd52a8448e0b8a5bbe94
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30895
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jordi Vaquero <jordi.vaquero@metempsy.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/arch/arm/self_debug.hh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/arch/arm/self_debug.hh b/src/arch/arm/self_debug.hh
index 9739c77d7..67654d2d7 100644
--- a/src/arch/arm/self_debug.hh
+++ b/src/arch/arm/self_debug.hh
@@ -58,7 +58,6 @@ class BrkPoint
   private:
     MiscRegIndex ctrlRegIndex;
     MiscRegIndex valRegIndex;
-    MiscRegIndex xRegIndex;
     SelfDebug * conf;
     bool isCntxtAware;
     bool VMID16enabled;
@@ -72,7 +71,7 @@ class BrkPoint
              MiscRegIndex _xIndex, SelfDebug* _conf, bool _ctxAw, bool lva,
              bool vmid16, bool aarch32):
                 ctrlRegIndex(_ctrlIndex), valRegIndex(_valIndex),
-                xRegIndex(_xIndex), conf(_conf), isCntxtAware(_ctxAw),
+                conf(_conf), isCntxtAware(_ctxAw),
                 VMID16enabled(vmid16), active_pc(0x0), enable(false)
     {
         maxAddrSize = lva ? 52: 48 ;
@@ -215,10 +214,6 @@ class SoftwareStep
     bool prevSteppedLdx;
     bool cpsrD;
 
-    bool ctrStepped;
-    bool ctrActivate;
-
-
   public:
     SoftwareStep(SelfDebug* s): bSS(false), stateSS(INACTIVE_STATE),
                                 conf(s), steppedLdx(false) { }
-- 
2.30.2