commit 5bb450ee9cc5da0c6582e63f41c504c7861e2788
author David 'Digit' Turner <digit@google.com> Fri Mar 14 17:19:45 2014 +0100
committer David 'Digit' Turner <digit@google.com> Wed Apr 09 19:43:17 2014 +0200
tree 4f88f8ad48ba71855956164a34b76b3286d798e0
parent 96e493a7f0be0193cb17b24c3492d998411b5031

Rename CONFIG_MEMCHECK to CONFIG_ANDROID_MEMCHECK

Change-Id: I9b0edcc1e243111f86f18c22eecbebb23219c297

translate-all.c

diff --git a/translate-all.c b/translate-all.c
index 097297b..a4a1d22 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -102,7 +102,7 @@
 /* code generation context */
 TCGContext tcg_ctx;
 
-#ifdef CONFIG_MEMCHECK
+#ifdef CONFIG_ANDROID_MEMCHECK
 /*
  * Memchecker code in this module copies TB PC <-> Guest PC map to the TB
  * descriptor after guest code has been translated in cpu_gen_init routine.
@@ -116,7 +116,7 @@
 void** gen_opc_tpc2gpc_ptr = &gen_opc_tpc2gpc[0];
 /* Number of (tb_pc, guest_pc) pairs stored in gen_opc_tpc2gpc array. */
 unsigned int gen_opc_tpc2gpc_pairs;
-#endif  // CONFIG_MEMCHECK
+#endif  // CONFIG_ANDROID_MEMCHECK
 
 /* XXX: suppress that */
 unsigned long code_gen_max_block_size(void)
@@ -200,7 +200,7 @@
     s->code_out_len += gen_code_size;
 #endif
 
-#ifdef CONFIG_MEMCHECK
+#ifdef CONFIG_ANDROID_MEMCHECK
     /* Save translated PC -> guest PC map into TB. */
     if (memcheck_enabled && gen_opc_tpc2gpc_pairs && is_cpu_user(env)) {
         tb->tpc2gpc =
@@ -212,7 +212,7 @@
         }
 
     }
-#endif  // CONFIG_MEMCHECK
+#endif  // CONFIG_ANDROID_MEMCHECK
 
 #ifdef DEBUG_DISAS
     if (qemu_loglevel_mask(CPU_LOG_TB_OUT_ASM)) {
@@ -697,10 +697,10 @@
     tb = &tcg_ctx.tb_ctx.tbs[tcg_ctx.tb_ctx.nb_tbs++];
     tb->pc = pc;
     tb->cflags = 0;
-#ifdef CONFIG_MEMCHECK
+#ifdef CONFIG_ANDROID_MEMCHECK
     tb->tpc2gpc = NULL;
     tb->tpc2gpc_pairs = 0;
-#endif  // CONFIG_MEMCHECK
+#endif  // CONFIG_ANDROID_MEMCHECK
     return tb;
 }
 
@@ -777,7 +777,7 @@
     tcg_ctx.tb_ctx.nb_tbs = 0;
 
     for(env = first_cpu; env != NULL; env = env->next_cpu) {
-#ifdef CONFIG_MEMCHECK
+#ifdef CONFIG_ANDROID_MEMCHECK
         int tb_to_clean;
         for (tb_to_clean = 0; tb_to_clean < TB_JMP_CACHE_SIZE; tb_to_clean++) {
             if (env->tb_jmp_cache[tb_to_clean] != NULL &&
@@ -787,7 +787,7 @@
                 env->tb_jmp_cache[tb_to_clean]->tpc2gpc_pairs = 0;
             }
         }
-#endif  // CONFIG_MEMCHECK
+#endif  // CONFIG_ANDROID_MEMCHECK
         memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
     }
 
@@ -964,13 +964,13 @@
     }
     tb->jmp_first = (TranslationBlock *)((uintptr_t)tb | 2); /* fail safe */
 
-#ifdef CONFIG_MEMCHECK
+#ifdef CONFIG_ANDROID_MEMCHECK
     if (tb->tpc2gpc != NULL) {
         g_free(tb->tpc2gpc);
         tb->tpc2gpc = NULL;
         tb->tpc2gpc_pairs = 0;
     }
-#endif  // CONFIG_MEMCHECK
+#endif  // CONFIG_ANDROID_MEMCHECK
 
     tcg_ctx.tb_ctx.tb_phys_invalidate_count++;
 }