From 8d345e96fd99073c04d82b8456c9be7856c3b181 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 4 Jul 2020 14:10:15 -0700 Subject: [PATCH] x86: Fix the indentation in arch/x86/stacktrace.hh. The namespace shouldn't be indented. Change-Id: I2bd5fa5adbbad62a35cfb54a9509c48d45076539 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30959 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/arch/x86/stacktrace.hh | 90 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 44 deletions(-) diff --git a/src/arch/x86/stacktrace.hh b/src/arch/x86/stacktrace.hh index 8ed89ec5f..c53362d08 100644 --- a/src/arch/x86/stacktrace.hh +++ b/src/arch/x86/stacktrace.hh @@ -36,65 +36,67 @@ class ThreadContext; namespace X86ISA { - class StackTrace - { - private: - ThreadContext *tc; - std::vector stack; - private: - bool isEntry(Addr addr); - bool decodePrologue(Addr sp, Addr callpc, Addr func, int &size, Addr &ra); - bool decodeSave(MachInst inst, int ®, int &disp); - bool decodeStack(MachInst inst, int &disp); +class StackTrace +{ + private: + ThreadContext *tc; + std::vector stack; + + private: + bool isEntry(Addr addr); + bool decodePrologue(Addr sp, Addr callpc, Addr func, int &size, Addr &ra); + bool decodeSave(MachInst inst, int ®, int &disp); + bool decodeStack(MachInst inst, int &disp); - void trace(ThreadContext *tc, bool is_call); + void trace(ThreadContext *tc, bool is_call); - public: - StackTrace(); - StackTrace(ThreadContext *tc, const StaticInstPtr &inst); - ~StackTrace(); + public: + StackTrace(); + StackTrace(ThreadContext *tc, const StaticInstPtr &inst); + ~StackTrace(); - void clear() - { - tc = 0; - stack.clear(); - } + void clear() + { + tc = 0; + stack.clear(); + } - bool valid() const { return tc != NULL; } - bool trace(ThreadContext *tc, const StaticInstPtr &inst); + bool valid() const { return tc != NULL; } + bool trace(ThreadContext *tc, const StaticInstPtr &inst); - public: - const std::vector &getstack() const { return stack; } + public: + const std::vector &getstack() const { return stack; } - static const int user = 1; - static const int console = 2; - static const int unknown = 3; + static const int user = 1; + static const int console = 2; + static const int unknown = 3; #if TRACING_ON - private: - void dump(); + private: + void dump(); - public: - void dprintf() { if (DTRACE(Stack)) dump(); } + public: + void dprintf() { if (DTRACE(Stack)) dump(); } #else - public: - void dprintf() {} + public: + void dprintf() {} #endif - }; +}; - inline bool - StackTrace::trace(ThreadContext *tc, const StaticInstPtr &inst) - { - if (!inst->isCall() && !inst->isReturn()) - return false; +inline bool +StackTrace::trace(ThreadContext *tc, const StaticInstPtr &inst) +{ + if (!inst->isCall() && !inst->isReturn()) + return false; - if (valid()) - clear(); + if (valid()) + clear(); - trace(tc, !inst->isReturn()); - return true; - } + trace(tc, !inst->isReturn()); + return true; } +} // namespace X86ISA + #endif // __ARCH_X86_STACKTRACE_HH__ -- 2.30.2