From dc0e629ea1f074691d307cde3ab7dd51a5e2102f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 29 Jan 2012 02:04:34 -0800 Subject: Implement Ali's review feedback. Try to decrease indentation, and remove some redundant FullSystem checks. --- src/arch/alpha/utility.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/arch/alpha/utility.cc') diff --git a/src/arch/alpha/utility.cc b/src/arch/alpha/utility.cc index efafec4bc..1bac650a0 100644 --- a/src/arch/alpha/utility.cc +++ b/src/arch/alpha/utility.cc @@ -39,24 +39,24 @@ namespace AlphaISA { uint64_t getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp) { - if (FullSystem) { - const int NumArgumentRegs = 6; - if (number < NumArgumentRegs) { - if (fp) - return tc->readFloatRegBits(16 + number); - else - return tc->readIntReg(16 + number); - } else { - Addr sp = tc->readIntReg(StackPointerReg); - FSTranslatingPortProxy* vp = tc->getVirtProxy(); - uint64_t arg = vp->read(sp + - (number-NumArgumentRegs) * sizeof(uint64_t)); - return arg; - } - } else { + if (!FullSystem) { panic("getArgument() is Full system only\n"); M5_DUMMY_RETURN; } + + const int NumArgumentRegs = 6; + if (number < NumArgumentRegs) { + if (fp) + return tc->readFloatRegBits(16 + number); + else + return tc->readIntReg(16 + number); + } else { + Addr sp = tc->readIntReg(StackPointerReg); + FSTranslatingPortProxy* vp = tc->getVirtProxy(); + uint64_t arg = vp->read(sp + + (number-NumArgumentRegs) * sizeof(uint64_t)); + return arg; + } } void -- cgit v1.2.3