tcg: Upgrade to upstream version.

This switches the full TCG implementation to the upstream version
from the following upstream commit:

  1a8e80d

Note that this requires completely reqwriting the softmmu_template.h
declarations to adapt to the new world order where all ld/st helpers
now accepts a CPUArchState* value as their first parameter.

+ This also gets rid of the REGPARM macro, which means that on
  i386, parameters are now passed on the stack instead of using
  registers. As surprising as it is, this doesn't seem to affect
  emulation performance in significant ways when starting the
  emulator with -force-32bit, compared to the latest SDK emulator
  binary. This may be due to the improved binary translator.

Note that this doesn't switch the emulation to use the new
MemoryRegion API, so there are still a few minor differences
with upstream softmmu_*.h headers.

The target-*/ sources have been minimally modified to accomodate
for the changes, and everything seems to work. However, not that
CONFIG_ANDROID_MEMCHECK_MMU hasn't been tested yet.

+ get rid of obsolete softmmu_outside_jit.c

NOTE: There are two important differences with the upstream sources:

  - An '#undef small' in tcg.c used to build the Windows binaries
    with mingw32 on Linux.

  - The declaration of cc_compute_all and cc_compute_c helpers in
    target-i386/helper.h use TCG_CALL_NO_SE instead of
    TCG_CALL_NO_SE_RWG. Otherwise, it's impossible to boot
    an x86 system image properly.

Change-Id: I6ed5c58f237493d29b1cefaff3e0db6f58977fbf

Author: digit-android

Makefile.target

@@ -52,8 +52,10 @@ common_LOCAL_CFLAGS += -I$(GLIB_INCLUDE_DIR)
 common_LOCAL_CFLAGS += $(EMULATOR_TARGET_CFLAGS)
 
 common_LOCAL_SRC_FILES += \
+    tcg/optimize.c \
     tcg/tcg.c \
     tcg-runtime.c \
+    util/bitops.c \
     util/host-utils.c \
 
 ##############################################################################

android/qemu/memcheck/memcheck_util.c

@@ -18,12 +18,13 @@
 #include "qemu-common.h"
 #include "android/utils/path.h"
 #include "cpu.h"
-#include "exec/softmmu_exec.h"
+#include "exec/cpu-all.h"
 
 #include "android/qemu/memcheck/memcheck_util.h"
 #include "android/qemu/memcheck/memcheck_proc_management.h"
 #include "android/qemu/memcheck/memcheck_logging.h"
 
+#include "exec/softmmu_exec.h"
 
 /* Gets symblos file path for the given module.
  * Param:

cputlb.c

@@ -373,36 +373,3 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr)
 
 #define SHIFT 3
 #include "exec/softmmu_template.h"
-
-// TODO(digit): Remove this once TCG is upgraded.
-uint8_t REGPARM __ldb_mmu(target_ulong addr, int mmu_idx) {
-    return helper_ldb_mmu(cpu_single_env, addr, mmu_idx);
-}
-
-void REGPARM __stb_mmu(target_ulong addr, uint8_t val, int mmu_idx) {
-    return helper_stb_mmu(cpu_single_env, addr, val, mmu_idx);
-}
-
-uint16_t REGPARM __ldw_mmu(target_ulong addr, int mmu_idx) {
-    return helper_ldw_mmu(cpu_single_env, addr, mmu_idx);
-}
-
-void REGPARM __stw_mmu(target_ulong addr, uint16_t val, int mmu_idx) {
-    return helper_stw_mmu(cpu_single_env, addr, val, mmu_idx);
-}
-
-uint32_t REGPARM __ldl_mmu(target_ulong addr, int mmu_idx) {
-    return helper_ldl_mmu(cpu_single_env, addr, mmu_idx);
-}
-
-void REGPARM __stl_mmu(target_ulong addr, uint32_t val, int mmu_idx) {
-    return helper_stl_mmu(cpu_single_env, addr, val, mmu_idx);
-}
-
-uint64_t REGPARM __ldq_mmu(target_ulong addr, int mmu_idx) {
-    return helper_ldq_mmu(cpu_single_env, addr, mmu_idx);
-}
-
-void REGPARM __stq_mmu(target_ulong addr, uint64_t val, int mmu_idx) {
-    return helper_stq_mmu(cpu_single_env, addr, val, mmu_idx);
-}

include/exec/exec-all.h

@@ -48,8 +48,19 @@ typedef struct TranslationBlock TranslationBlock;
 /* XXX: make safe guess about sizes */
 #define MAX_OP_PER_INSTR 208
 
-/* A Call op needs up to 6 + 2N parameters (N = number of arguments).  */
-#define MAX_OPC_PARAM 10
+#if HOST_LONG_BITS == 32
+#define MAX_OPC_PARAM_PER_ARG 2
+#else
+#define MAX_OPC_PARAM_PER_ARG 1
+#endif
+#define MAX_OPC_PARAM_IARGS 5
+#define MAX_OPC_PARAM_OARGS 1
+#define MAX_OPC_PARAM_ARGS (MAX_OPC_PARAM_IARGS + MAX_OPC_PARAM_OARGS)
+
+/* A Call op needs up to 4 + 2N parameters on 32-bit archs,
+ * and up to 4 + N parameters on 64-bit archs
+ * (N = number of input arguments + output arguments).  */
+#define MAX_OPC_PARAM (4 + (MAX_OPC_PARAM_PER_ARG * MAX_OPC_PARAM_ARGS))
 #define OPC_BUF_SIZE 2048
 #define OPC_MAX_SIZE (OPC_BUF_SIZE - MAX_OP_PER_INSTR)
 
@@ -416,7 +427,10 @@ extern void *io_mem_opaque[IO_MEM_NB_ENTRIES];
 void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx,
               uintptr_t retaddr);
 
-#include "exec/softmmu_defs.h"
+uint8_t helper_ldb_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);
+uint16_t helper_ldw_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);
+uint32_t helper_ldl_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);
+uint64_t helper_ldq_cmmu(CPUArchState *env, target_ulong addr, int mmu_idx);
 
 #define ACCESS_TYPE (NB_MMU_MODES + 1)
 #define MEMSUFFIX _code
@@ -444,6 +458,7 @@ static inline tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong
     return addr;
 }
 #else
+/* cputlb.c */
 tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr);
 #endif
 

include/exec/poison.h

@@ -14,6 +14,7 @@
 #pragma GCC poison TARGET_M68K
 #pragma GCC poison TARGET_MIPS
 #pragma GCC poison TARGET_MIPS64
+#pragma GCC poison TARGET_OPENRISC
 #pragma GCC poison TARGET_PPC
 #pragma GCC poison TARGET_PPCEMB
 #pragma GCC poison TARGET_PPC64
@@ -35,6 +36,7 @@
 #pragma GCC poison TARGET_PAGE_ALIGN
 
 #pragma GCC poison CPUOldState
+#pragma GCC poison CPUArchState
 #pragma GCC poison env
 
 #pragma GCC poison lduw_phys

include/exec/softmmu_defs.h

@@ -1,4 +1,14 @@
-/* Common softmmu definitions and inline routines.  */
+/*
+ *  Software MMU support
+ *
+ * Generate inline load/store functions for all MMU modes (typically
+ * at least _user and _kernel) as well as _data versions, for all data
+ * sizes.
+ *
+ * Used by target op helpers.
+ *
+ * MMU mode suffixes are defined in target cpu.h.
+ */
 
 /* XXX: find something cleaner.
  * Furthermore, this is false for 64 bits targets
@@ -9,7 +19,8 @@
 #define ldul_executive  ldl_executive
 #define ldul_supervisor ldl_supervisor
 
-#include "exec/softmmu_defs.h"
+/* The memory helpers for tcg-generated code need tcg_target_long etc.  */
+#include "tcg.h"
 
 #define ACCESS_TYPE 0
 #define MEMSUFFIX MMU_MODE0_SUFFIX

include/exec/softmmu_exec.h

@@ -114,7 +114,8 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, target_ulong ptr)
     mmu_idx = CPU_MMU_INDEX;
     if (unlikely(env->tlb_table[mmu_idx][page_index].ADDR_READ !=
                  (addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
-        res = (DATA_STYPE)glue(glue(helper_ld, SUFFIX), MMUSUFFIX)(env, addr, mmu_idx);
+        res = (DATA_STYPE)glue(glue(helper_ld, SUFFIX),
+                               MMUSUFFIX)(env, addr, mmu_idx);
     } else {
         uintptr_t hostaddr = addr + env->tlb_table[mmu_idx][page_index].addend;
         res = glue(glue(lds, SUFFIX), _raw)(hostaddr);