diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-09-14 14:32:27 -0700 |
| commit | 5d8f37ad78fc66901af50c762029a501561f3b23 (patch) | |
| tree | 206790f8f21000850a98c4f9590a79e779106278 /tcg/hppa | |
| parent | cd059b15f2c7df69f4a087bd66900eb172e41d1c (diff) | |
| download | external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.zip external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.gz external_qemu-5d8f37ad78fc66901af50c762029a501561f3b23.tar.bz2 | |
Merge upstream QEMU 10.0.50 into the Android source tree.
This change integrates many changes from the upstream QEMU sources.
Its main purpose is to enable correct ARMv6 and ARMv7 support to the
Android emulator. Due to the nature of the upstream code base, this
unfortunately also required changes to many other parts of the source.
Note that to ensure easier integrations in the future, some source files
and directories that have heavy Android-specific customization have been
renamed with an -android suffix. The original files are still there for
easier integration tracking, but *never* compiled. For example:
net.c net-android.c
qemu-char.c qemu-char-android.c
slirp/ slirp-android/
etc...
Tested on linux-x86, darwin-x86 and windows host machines.
Diffstat (limited to 'tcg/hppa')
| -rw-r--r-- | tcg/hppa/tcg-target.c | 4 | ||||
| -rw-r--r-- | tcg/hppa/tcg-target.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tcg/hppa/tcg-target.c b/tcg/hppa/tcg-target.c index 3affd26..5960c03 100644 --- a/tcg/hppa/tcg-target.c +++ b/tcg/hppa/tcg-target.c @@ -22,6 +22,7 @@ * THE SOFTWARE. */ +#ifndef NDEBUG static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { "%r0", "%r1", @@ -56,6 +57,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { "%sp", "%r31", }; +#endif static const int tcg_target_reg_alloc_order[] = { TCG_REG_R4, @@ -106,7 +108,7 @@ static inline int tcg_target_get_call_iarg_regs_count(int flags) } /* parse target specific constraints */ -int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) +static int target_parse_constraint(TCGArgConstraint *ct, const char **pct_str) { const char *ct_str; diff --git a/tcg/hppa/tcg-target.h b/tcg/hppa/tcg-target.h index 8e2693d..7ab6f0c 100644 --- a/tcg/hppa/tcg-target.h +++ b/tcg/hppa/tcg-target.h @@ -78,13 +78,12 @@ enum { //#define TCG_TARGET_HAS_ext8s_i32 //#define TCG_TARGET_HAS_ext16s_i32 //#define TCG_TARGET_HAS_bswap16_i32 -//#define TCG_TARGET_HAS_bswap_i32 +//#define TCG_TARGET_HAS_bswap32_i32 /* Note: must be synced with dyngen-exec.h */ #define TCG_AREG0 TCG_REG_R17 #define TCG_AREG1 TCG_REG_R14 #define TCG_AREG2 TCG_REG_R15 -#define TCG_AREG3 TCG_REG_R16 static inline void flush_icache_range(unsigned long start, unsigned long stop) { |