From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KVqNu-0002Fm-B1 for qemu-devel@nongnu.org; Wed, 20 Aug 2008 12:18:10 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KVqNt-0002FM-Jd for qemu-devel@nongnu.org; Wed, 20 Aug 2008 12:18:09 -0400 Received: from [199.232.76.173] (port=35668 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KVqNt-0002FC-EY for qemu-devel@nongnu.org; Wed, 20 Aug 2008 12:18:09 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:15524) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KVqNs-0001II-TI for qemu-devel@nongnu.org; Wed, 20 Aug 2008 12:18:09 -0400 Received: from mail1.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KFLUpL023534 for ; Wed, 20 Aug 2008 17:21:30 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m7KFLUst002199 for ; Wed, 20 Aug 2008 17:21:30 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <48AC367B.90707@siemens.com> Message-ID: <48AC3015.3000409@siemens.com> Date: Wed, 20 Aug 2008 16:54:13 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <486CF559.5090805@siemens.com> <48AC2E09.3030405@siemens.com> In-Reply-To: <48AC2E09.3030405@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RESEND][PATCH 6/13] Switch self-modified code recompilation to next_cflags Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Switching tb_invalidate_phys_page_range and tb_invalidate_phys_page over to the new next_cflags scheme when self-modifying code was detected can save a few lines of code and remove arch dependency. Signed-off-by: Jan Kiszka --- exec.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -851,12 +851,11 @@ TranslationBlock *tb_gen_code(CPUState * void tb_invalidate_phys_page_range(target_phys_addr_t start, target_phys_addr_t end, int is_cpu_write_access) { - int n, current_tb_modified, current_tb_not_found, current_flags; + int n, current_tb_modified, current_tb_not_found; CPUState *env = cpu_single_env; PageDesc *p; TranslationBlock *tb, *tb_next, *current_tb, *saved_tb; target_ulong tb_start, tb_end; - target_ulong current_pc, current_cs_base; p = page_find(start >> TARGET_PAGE_BITS); if (!p) @@ -873,9 +872,6 @@ void tb_invalidate_phys_page_range(targe current_tb_not_found = is_cpu_write_access; current_tb_modified = 0; current_tb = NULL; /* avoid warning */ - current_pc = 0; /* avoid warning */ - current_cs_base = 0; /* avoid warning */ - current_flags = 0; /* avoid warning */ tb = p->first_tb; while (tb != NULL) { n = (long)tb & 3; @@ -912,14 +908,6 @@ void tb_invalidate_phys_page_range(targe current_tb_modified = 1; cpu_restore_state(current_tb, env, env->mem_io_pc, NULL); -#if defined(TARGET_I386) - current_flags = env->hflags; - current_flags |= (env->eflags & (IOPL_MASK | TF_MASK | VM_MASK)); - current_cs_base = (target_ulong)env->segs[R_CS].base; - current_pc = current_cs_base + env->eip; -#else -#error unsupported CPU -#endif } #endif /* TARGET_HAS_PRECISE_SMC */ /* we need to do that to handle the case where a signal @@ -953,7 +941,7 @@ void tb_invalidate_phys_page_range(targe modifying the memory. It will ensure that it cannot modify itself */ env->current_tb = NULL; - tb_gen_code(env, current_pc, current_cs_base, current_flags, 1); + env->next_cflags = 1; cpu_resume_from_signal(env, NULL); } #endif @@ -992,8 +980,7 @@ static inline void tb_invalidate_phys_pa static void tb_invalidate_phys_page(target_phys_addr_t addr, unsigned long pc, void *puc) { - int n, current_flags, current_tb_modified; - target_ulong current_pc, current_cs_base; + int n, current_tb_modified; PageDesc *p; TranslationBlock *tb, *current_tb; #ifdef TARGET_HAS_PRECISE_SMC @@ -1007,9 +994,6 @@ static void tb_invalidate_phys_page(targ tb = p->first_tb; current_tb_modified = 0; current_tb = NULL; - current_pc = 0; /* avoid warning */ - current_cs_base = 0; /* avoid warning */ - current_flags = 0; /* avoid warning */ #ifdef TARGET_HAS_PRECISE_SMC if (tb && pc != 0) { current_tb = tb_find_pc(pc); @@ -1029,14 +1013,6 @@ static void tb_invalidate_phys_page(targ current_tb_modified = 1; cpu_restore_state(current_tb, env, pc, puc); -#if defined(TARGET_I386) - current_flags = env->hflags; - current_flags |= (env->eflags & (IOPL_MASK | TF_MASK | VM_MASK)); - current_cs_base = (target_ulong)env->segs[R_CS].base; - current_pc = current_cs_base + env->eip; -#else -#error unsupported CPU -#endif } #endif /* TARGET_HAS_PRECISE_SMC */ tb_phys_invalidate(tb, addr); @@ -1049,7 +1025,7 @@ static void tb_invalidate_phys_page(targ modifying the memory. It will ensure that it cannot modify itself */ env->current_tb = NULL; - tb_gen_code(env, current_pc, current_cs_base, current_flags, 1); + env->next_cflags = 1; cpu_resume_from_signal(env, puc); } #endif