Commit 05b922dd authored by Peter Maydell's avatar Peter Maydell Committed by Andrzej Zaborowski
Browse files

tcg/arm: Use r6 as TCG_AREG0 to avoid clash with Thumb framepointer 



On ARM, in Thumb mode r7 is used for the framepointer; this meant
that we would fail to compile in debug mode because we were using r7
for TCG_AREG0. Shift to r6 instead to avoid this clash.
(Bug reported as LP:870990.)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndrzej Zaborowski <andrew.zaborowski@intel.com>
parent 520a02f8

dyngen-exec.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#elif defined(_ARCH_PPC)

#define AREG0 "r27"

#elif defined(__arm__)

#define AREG0 "r7"

#define AREG0 "r6"

#elif defined(__hppa__)

#define AREG0 "r17"

#elif defined(__mips__)

tcg/arm/tcg-target.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef enum { 


enum {

    /* Note: must be synced with dyngen-exec.h */

    TCG_AREG0 = TCG_REG_R7,

    TCG_AREG0 = TCG_REG_R6,

};



static inline void flush_icache_range(unsigned long start, unsigned long stop)