diff options
Diffstat (limited to 'src/arch/arm/utility.cc')
-rw-r--r-- | src/arch/arm/utility.cc | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc index b31dc4324..0527e135f 100644 --- a/src/arch/arm/utility.cc +++ b/src/arch/arm/utility.cc @@ -40,16 +40,13 @@ #include "arch/arm/faults.hh" #include "arch/arm/isa_traits.hh" +#include "arch/arm/tlb.hh" #include "arch/arm/utility.hh" +#include "arch/arm/vtophys.hh" #include "config/use_checker.hh" #include "cpu/thread_context.hh" - -#if FULL_SYSTEM -#include "arch/arm/vtophys.hh" #include "mem/fs_translating_port_proxy.hh" -#endif - -#include "arch/arm/tlb.hh" +#include "sim/full_system.hh" namespace ArmISA { @@ -67,20 +64,24 @@ initCPU(ThreadContext *tc, int cpuId) uint64_t getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp) { -#if FULL_SYSTEM + if (!FullSystem) { + panic("getArgument() only implemented for full system mode.\n"); + M5_DUMMY_RETURN + } + if (size == (uint16_t)(-1)) size = ArmISA::MachineBytes; if (fp) panic("getArgument(): Floating point arguments not implemented\n"); if (number < NumArgumentRegs) { - // If the argument is 64 bits, it must be in an even regiser number - // Increment the number here if it isn't even + // If the argument is 64 bits, it must be in an even regiser + // number. Increment the number here if it isn't even. if (size == sizeof(uint64_t)) { if ((number % 2) != 0) number++; - // Read the two halves of the data - // number is inc here to get the second half of the 64 bit reg + // Read the two halves of the data. Number is inc here to + // get the second half of the 64 bit reg. uint64_t tmp; tmp = tc->readIntReg(number++); tmp |= tc->readIntReg(number) << 32; @@ -106,10 +107,6 @@ getArgument(ThreadContext *tc, int &number, uint16_t size, bool fp) } return arg; } -#else - panic("getArgument() only implemented for FULL_SYSTEM\n"); - M5_DUMMY_RETURN -#endif } void |