gwj / at91sam9263 · Commits

Commit 2d69f3590d533ee029fb9739a2bd5339dde22bcb

Authored by Paul Brook
1 parent 5e650002

ARM host fixes 

Minor TCG cleanups and warning fixes for ARM hosts.

Signed-off-by: Paul Brook <paul@codesourcery.com>
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
tcg/arm/tcg-target.c
  View file @2d69f35
@@ -1567,7 +1567,7 @@ static inline void tcg_out_st(TCGContext *s, TCGType type, int arg, @@ -1567,7 +1567,7 @@ static inline void tcg_out_st(TCGContext *s, TCGType type, int arg,
1567 tcg_out_st32(s, COND_AL, arg, arg1, arg2); 1567 tcg_out_st32(s, COND_AL, arg, arg1, arg2);
1568 } 1568 }
1569 1569
1570 -void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val) 1570 +static void tcg_out_addi(TCGContext *s, int reg, tcg_target_long val)
1571 { 1571 {
1572 if (val > 0) 1572 if (val > 0)
1573 if (val < 0x100) 1573 if (val < 0x100)
tcg/arm/tcg-target.h
  View file @2d69f35
@@ -51,9 +51,10 @@ enum { @@ -51,9 +51,10 @@ enum {
51 TCG_REG_R12, 51 TCG_REG_R12,
52 TCG_REG_R13, 52 TCG_REG_R13,
53 TCG_REG_R14, 53 TCG_REG_R14,
54 - TCG_TARGET_NB_REGS  
55 }; 54 };
56 55
  56 +#define TCG_TARGET_NB_REGS 15
  57 +
57 /* used for function call generation */ 58 /* used for function call generation */
58 #define TCG_REG_CALL_STACK TCG_REG_R13 59 #define TCG_REG_CALL_STACK TCG_REG_R13
59 #define TCG_TARGET_STACK_ALIGN 8 60 #define TCG_TARGET_STACK_ALIGN 8
@@ -69,8 +70,7 @@ enum { @@ -69,8 +70,7 @@ enum {
69 static inline void flush_icache_range(unsigned long start, unsigned long stop) 70 static inline void flush_icache_range(unsigned long start, unsigned long stop)
70 { 71 {
71 #if QEMU_GNUC_PREREQ(4, 1) 72 #if QEMU_GNUC_PREREQ(4, 1)
72 - void __clear_cache(char *beg, char *end);  
73 - __clear_cache((char *) start, (char *) stop); 73 + __builtin___clear_cache((char *) start, (char *) stop);
74 #else 74 #else
75 register unsigned long _beg __asm ("a1") = start; 75 register unsigned long _beg __asm ("a1") = start;
76 register unsigned long _end __asm ("a2") = stop; 76 register unsigned long _end __asm ("a2") = stop;