1a2,13
> * Copyright (c) 2010 ARM Limited
> * All rights reserved
> *
> * The license below extends only to copyright in the software and shall
> * not be construed as granting a license to any other intellectual
> * property including but not limited to intellectual property relating
> * to a hardware implementation of the functionality of the software
> * licensed hereunder. You may use the software subject to the license
> * terms below provided that you ensure that this notice is replicated
> * unmodified and in its entirety in all distributions of the software,
> * modified or unmodified, in source code or in binary form.
> *
35a48,49
> #include "arch/arm/types.hh"
>
325,328c339
< static inline IntRegIndex
< intRegForceUser(unsigned index)
< {
< assert(index < NUM_ARCH_INTREGS);
---
> static const unsigned intRegsPerMode = NUM_INTREGS;
330c341,345
< return index == 15 ? (IntRegIndex)15 : (IntRegIndex)(index + NUM_INTREGS);
---
> static inline int
> intRegInMode(OperatingMode mode, int reg)
> {
> assert(reg < NUM_ARCH_INTREGS);
> return mode * intRegsPerMode + reg;