[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] Switch self-modified code recompilation to ne
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 06/13] Switch self-modified code recompilation to next_cflags |
Date: |
Tue, 14 Oct 2008 11:12:29 +0200 |
User-agent: |
quilt/0.46_cvs20080326-19.1 |
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 <address@hidden>
---
exec.c | 32 ++++----------------------------
1 file changed, 4 insertions(+), 28 deletions(-)
Index: b/exec.c
===================================================================
--- a/exec.c
+++ b/exec.c
@@ -885,12 +885,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)
@@ -907,9 +906,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;
@@ -946,14 +942,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
@@ -987,7 +975,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
@@ -1026,8 +1014,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
@@ -1041,9 +1028,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);
@@ -1063,14 +1047,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);
@@ -1083,7 +1059,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
- [Qemu-devel] [PATCH 00/13] Enhance debugging support - 3rd take, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 01/13] Return appropriate watch message to gdb, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 05/13] Introduce next_cflags, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 06/13] Switch self-modified code recompilation to next_cflags,
Jan Kiszka <=
- [Qemu-devel] [PATCH 03/13] Set mem_io_vaddr on io_read, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 10/13] Introduce BP_WATCHPOINT_HIT flag, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 12/13] Introduce BP_CPU as a breakpoint type, Jan Kiszka, 2008/10/14
- [Qemu-devel] [PATCH 02/13] Refactor and enhance break/watchpoint API, Jan Kiszka, 2008/10/14
- Re: [Qemu-devel] [PATCH 02/13] Refactor and enhance break/watchpoint API, Glauber Costa, 2008/10/14