Merge exec.c

Change-Id: Ia7f1c7cd2310db10bb7bbbabd1b9f8f0a14c9d27
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/exec.c b/exec.c
index d66bc4254a2639293162b27c3f1b1841e1a4770e..fb4b7b725aadb30e911b7e52f797f984b436f491 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -250,24 +250,7 @@ static const VMStateDescription vmstate_cpu_common = {
 #define vmstate_cpu_common vmstate_dummy
 #endif
 
-<<<<<<< HEAD
-#if defined(CONFIG_QEMU_LDST_OPTIMIZATION) && defined(CONFIG_SOFTMMU)
-/* check whether the given addr is in TCG generated code buffer or not */
-bool is_tcg_gen_code(uintptr_t tc_ptr)
-{
-    /* This can be called during code generation, code_gen_buffer_size
-       is used instead of code_gen_ptr for upper boundary checking */
-    return (tc_ptr >= (uintptr_t)code_gen_buffer &&
-            tc_ptr < (uintptr_t)(code_gen_buffer + code_gen_buffer_size));
-}
-#endif
-
-/* find the TB 'tb' such that tb[0].tc_ptr <= tc_ptr <
-   tb[1].tc_ptr. Return NULL if not found */
-TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
-=======
 CPUState *qemu_get_cpu(int index)
->>>>>>> test1.5
 {
     CPUArchState *env = first_cpu;
     CPUState *cpu = NULL;