From 8b8d991df053dad34cd490db6c8e7c94b5413290 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 13 Aug 2014 06:57:30 -0400 Subject: [PATCH] mips: Remove unused private members to fix compile-time warning Certain versions of clang complain about unused private members if they are not used. This changeset removes such members from the MIPS-specific classes to silence the warning. --- src/arch/mips/interrupts.hh | 6 ------ src/arch/mips/linux/system.hh | 39 ----------------------------------- src/arch/mips/stacktrace.hh | 2 -- src/arch/mips/tlb.cc | 15 -------------- src/dev/mips/malta_io.hh | 3 --- 5 files changed, 65 deletions(-) diff --git a/src/arch/mips/interrupts.hh b/src/arch/mips/interrupts.hh index c852bc9d0..8367bf91c 100755 --- a/src/arch/mips/interrupts.hh +++ b/src/arch/mips/interrupts.hh @@ -59,7 +59,6 @@ class Interrupts : public SimObject Interrupts(Params * p) : SimObject(p) { - newInfoSet = false; } void @@ -127,11 +126,6 @@ class Interrupts : public SimObject { fatal("Unserialization of Interrupts Unimplemented for MIPS"); } - - private: - bool newInfoSet; - int newIpl; - int newSummary; }; } diff --git a/src/arch/mips/linux/system.hh b/src/arch/mips/linux/system.hh index 984f74694..55e47bbb2 100644 --- a/src/arch/mips/linux/system.hh +++ b/src/arch/mips/linux/system.hh @@ -87,45 +87,6 @@ class LinuxMipsSystem : public MipsSystem Addr InitrdSize() const { return Param() + 0x108; } static const int CommandLineSize = 256; - private: -#ifndef NDEBUG - /** Event to halt the simulator if the kernel calls panic() */ - BreakPCEvent *kernelPanicEvent; - - /** Event to halt the simulator if the kernel calls die_if_kernel */ - BreakPCEvent *kernelDieEvent; -#endif - - /** - * Event to skip determine_cpu_caches() because we don't support - * the IPRs that the code can access to figure out cache sizes - */ - SkipFuncEvent *skipCacheProbeEvent; - - /** PC based event to skip the ide_delay_50ms() call */ - SkipFuncEvent *skipIdeDelay50msEvent; - - /** - * PC based event to skip the dprink() call and emulate its - * functionality - */ - Linux::DebugPrintkEvent *debugPrintkEvent; - - /** - * Skip calculate_delay_loop() rather than waiting for this to be - * calculated - */ - SkipDelayLoopEvent *skipDelayLoopEvent; - - /** - * Event to print information about thread switches if the trace flag - * Thread is set - */ - PrintThreadInfo *printThreadEvent; - - /** Grab the PCBB of the idle process when it starts */ - IdleStartEvent *idleStartEvent; - public: typedef LinuxMipsSystemParams Params; LinuxMipsSystem(Params *p); diff --git a/src/arch/mips/stacktrace.hh b/src/arch/mips/stacktrace.hh index 8520c3d1b..f4dc04d29 100644 --- a/src/arch/mips/stacktrace.hh +++ b/src/arch/mips/stacktrace.hh @@ -45,8 +45,6 @@ class ProcessInfo private: ThreadContext *tc; - int thread_info_size; - int task_struct_size; int task_off; int pid_off; int name_off; diff --git a/src/arch/mips/tlb.cc b/src/arch/mips/tlb.cc index 420707bd0..b43797541 100644 --- a/src/arch/mips/tlb.cc +++ b/src/arch/mips/tlb.cc @@ -59,21 +59,6 @@ using namespace MipsISA; // MIPS TLB // -static inline mode_type -getOperatingMode(MiscReg Stat) -{ - if ((Stat & 0x10000006) != 0 || (Stat & 0x18) ==0) { - return mode_kernel; - } else if ((Stat & 0x18) == 0x8) { - return mode_supervisor; - } else if ((Stat & 0x18) == 0x10) { - return mode_user; - } else { - return mode_number; - } -} - - TLB::TLB(const Params *p) : BaseTLB(p), size(p->size), nlu(0) { diff --git a/src/dev/mips/malta_io.hh b/src/dev/mips/malta_io.hh index 9f49f20cc..f74d42da4 100755 --- a/src/dev/mips/malta_io.hh +++ b/src/dev/mips/malta_io.hh @@ -51,9 +51,6 @@ */ class MaltaIO : public BasicPioDevice { - private: - struct tm tm; - protected: class RTC : public MC146818