From: Gabe Black <gabeblack@google.com>
Date: Thu, 10 Oct 2019 00:10:08 +0000 (-0700)
Subject: mips,riscv: Get rid of some Alpha cruft in these System classes.
X-Git-Tag: v19.0.0.0~395
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1a101fc1b5f231b38b251a0da6088dfd947904a;p=gem5.git

mips,riscv: Get rid of some Alpha cruft in these System classes.

The consolePanicEvent pointer and addConsoleFuncEvent template were
inherited from Alpha and were not used (and probably make no sense) for
MIPS or RISCV which (to my knowledge) don't have the idea of a
"console" binary.

Change-Id: I109b866a65f69c7334062f7304c7b18acc51d99d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21782
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
---

diff --git a/src/arch/mips/system.hh b/src/arch/mips/system.hh
index eb28b3b2f..c48faa1ba 100644
--- a/src/arch/mips/system.hh
+++ b/src/arch/mips/system.hh
@@ -66,22 +66,9 @@ class MipsSystem : public System
     /** Object pointer for the console code */
     ObjectFile *console;
 
-#ifndef NDEBUG
-  /** Event to halt the simulator if the console calls panic() */
-    BreakPCEvent *consolePanicEvent;
-#endif
-
   protected:
     const Params *params() const { return (const Params *)_params; }
 
-    /** Add a function-based event to the console code. */
-    template <class T>
-    T *
-    addConsoleFuncEvent(const char *lbl)
-    {
-        return addFuncEvent<T>(consoleSymtab, lbl);
-    }
-
     virtual Addr fixFuncEventAddr(Addr addr);
 
 };
diff --git a/src/arch/riscv/system.hh b/src/arch/riscv/system.hh
index 7bff5cd45..78638d0ad 100644
--- a/src/arch/riscv/system.hh
+++ b/src/arch/riscv/system.hh
@@ -79,22 +79,9 @@ class RiscvSystem : public System
     /** Object pointer for the console code */
     ObjectFile *console;
 
-#ifndef NDEBUG
-  /** Event to halt the simulator if the console calls panic() */
-    BreakPCEvent *consolePanicEvent;
-#endif
-
   protected:
     const Params *params() const { return (const Params *)_params; }
 
-    /** Add a function-based event to the console code. */
-    template <class T>
-    T *
-    addConsoleFuncEvent(const char *lbl)
-    {
-        return addFuncEvent<T>(consoleSymtab, lbl);
-    }
-
     virtual Addr fixFuncEventAddr(Addr addr);
 
 };