diff options
| -rw-r--r-- | android/main.c | 10 | ||||
| -rw-r--r-- | exec-all.h | 2 | ||||
| -rw-r--r-- | tcg/tcg.c | 21 | ||||
| -rw-r--r-- | tcg/tcg.h | 4 |
4 files changed, 13 insertions, 24 deletions
diff --git a/android/main.c b/android/main.c index 686dac8..682cfce 100644 --- a/android/main.c +++ b/android/main.c @@ -67,8 +67,6 @@ #include "android/globals.h" #include "tcpdump.h" -#include "tcg.h" - /* in vl.c */ extern void qemu_help(int code); @@ -2358,14 +2356,6 @@ int main(int argc, char **argv) args[n++] = "-cpu"; args[n++] = "cortex-a8"; } - /* we also disable liveness analysis in the code generator, because it seems - * that ARMv7 -> x86 code generation triggers a fatal assertion when it is - * activated. The drawback is that the generated code is slower, but at the - * moment, ARMv7 emulation is only used to run the dex preopt pass within the - * Android build system. This hack should be removed when we fix the code - * generator. - */ - tcg_disable_liveness_analysis = 1; } args[n++] = "-initrd"; @@ -38,7 +38,7 @@ typedef struct TranslationBlock TranslationBlock; #define MAX_OP_PER_INSTR 64 /* A Call op needs up to 6 + 2N parameters (N = number of arguments). */ #define MAX_OPC_PARAM 10 -#define OPC_BUF_SIZE 512 +#define OPC_BUF_SIZE 2048 #define OPC_MAX_SIZE (OPC_BUF_SIZE - MAX_OP_PER_INSTR) /* Maximum size a TCG op can expand to. This is complicated because a @@ -57,8 +57,6 @@ #include "tcg-op.h" #include "elf.h" -int tcg_disable_liveness_analysis; - static void patch_reloc(uint8_t *code_ptr, int type, tcg_target_long value, tcg_target_long addend); @@ -1079,13 +1077,11 @@ static void tcg_liveness_analysis(TCGContext *s) uint8_t *dead_temps; unsigned int dead_iargs; - if (tcg_disable_liveness_analysis) { - int nb_ops; - nb_ops = gen_opc_ptr - gen_opc_buf + 1; - - s->op_dead_iargs = tcg_malloc(nb_ops * sizeof(uint16_t)); - memset(s->op_dead_iargs, 0, nb_ops * sizeof(uint16_t)); - return; + /* sanity check */ + if (gen_opc_ptr - gen_opc_buf > OPC_BUF_SIZE) { + fprintf(stderr, "PANIC: too many opcodes generated (%d > %d)\n", + gen_opc_ptr - gen_opc_buf, OPC_BUF_SIZE); + tcg_abort(); } gen_opc_ptr++; /* skip end */ @@ -2021,6 +2017,13 @@ int tcg_gen_code(TCGContext *s, uint8_t *gen_code_buf) } #endif + /* sanity check */ + if (gen_opc_ptr - gen_opc_buf > OPC_BUF_SIZE) { + fprintf(stderr, "PANIC: too many opcodes generated (%d > %d)\n", + gen_opc_ptr - gen_opc_buf, OPC_BUF_SIZE); + tcg_abort(); + } + tcg_gen_code_common(s, gen_code_buf, -1); /* flush instruction cache */ @@ -471,7 +471,3 @@ extern uint8_t code_gen_prologue[]; #else #define tcg_qemu_tb_exec(tb_ptr) ((long REGPARM (*)(void *))code_gen_prologue)(tb_ptr) #endif - -/* set to 1 to disable LIVENESS ANALYSIS - temporary work-around for - * specific fatal assertion error in ARMv7 -> x86 code translation. */ -extern int tcg_disable_liveness_analysis; |