[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls |
Date: |
Fri, 27 Jun 2008 17:38:13 -0300 |
---
accel.h | 8 ++++++++
exec-all.h | 2 +-
exec.c | 27 ++++++++++++---------------
kqemu.c | 26 +++++++++++++++-----------
4 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/accel.h b/accel.h
index 7cef043..5395e05 100644
--- a/accel.h
+++ b/accel.h
@@ -6,6 +6,7 @@ typedef struct QEMUAccel {
int (*info)(CPUState *env, char *buf);
int (*profile)(CPUState *env, char *buf);
void (*set_notdirty)(ram_addr_t addr);
+ void (*modify_page)(ram_addr_t addr, int dirty_flags);
} QEMUAccel;
extern QEMUAccel *current_accel;
@@ -58,3 +59,10 @@ static inline void accel_set_notdirty(target_ulong addr)
if (current_accel && current_accel->set_notdirty)
current_accel->set_notdirty(addr);
}
+
+static inline void accel_modify_page(target_ulong addr, int dirty_flags)
+{
+ if (current_accel && current_accel->modify_page)
+ current_accel->modify_page(addr, dirty_flags);
+}
+
diff --git a/exec-all.h b/exec-all.h
index b126050..c9bdca8 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -376,7 +376,7 @@ int kqemu_cpu_exec(CPUState *env);
void kqemu_flush_page(CPUState *env, target_ulong addr);
void kqemu_flush(CPUState *env, int global);
void kqemu_set_notdirty(ram_addr_t ram_addr);
-void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr);
+void kqemu_modify_page(ram_addr_t ram_addr, int dirty_flags);
void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t size,
ram_addr_t phys_offset);
void kqemu_cpu_interrupt(CPUState *env);
diff --git a/exec.c b/exec.c
index 04d5ed7..f62508b 100644
--- a/exec.c
+++ b/exec.c
@@ -2217,12 +2217,11 @@ static void notdirty_mem_writeb(void *opaque,
target_phys_addr_t ram_addr,
dirty_flags = phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS];
#endif
}
+
stb_p(phys_ram_base + ram_addr, val);
-#ifdef USE_KQEMU
- if (cpu_single_env->kqemu_enabled &&
- (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
- kqemu_modify_page(cpu_single_env, ram_addr);
-#endif
+
+ accel_modify_page(ram_addr, dirty_flags);
+
dirty_flags |= (0xff & ~CODE_DIRTY_FLAG);
phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS] = dirty_flags;
/* we remove the notdirty callback only if the code has been
@@ -2242,12 +2241,11 @@ static void notdirty_mem_writew(void *opaque,
target_phys_addr_t ram_addr,
dirty_flags = phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS];
#endif
}
+
stw_p(phys_ram_base + ram_addr, val);
-#ifdef USE_KQEMU
- if (cpu_single_env->kqemu_enabled &&
- (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
- kqemu_modify_page(cpu_single_env, ram_addr);
-#endif
+
+ accel_modify_page(ram_addr, dirty_flags);
+
dirty_flags |= (0xff & ~CODE_DIRTY_FLAG);
phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS] = dirty_flags;
/* we remove the notdirty callback only if the code has been
@@ -2267,12 +2265,11 @@ static void notdirty_mem_writel(void *opaque,
target_phys_addr_t ram_addr,
dirty_flags = phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS];
#endif
}
+
stl_p(phys_ram_base + ram_addr, val);
-#ifdef USE_KQEMU
- if (cpu_single_env->kqemu_enabled &&
- (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
- kqemu_modify_page(cpu_single_env, ram_addr);
-#endif
+
+ accel_modify_page(ram_addr, dirty_flags);
+
dirty_flags |= (0xff & ~CODE_DIRTY_FLAG);
phys_ram_dirty[ram_addr >> TARGET_PAGE_BITS] = dirty_flags;
/* we remove the notdirty callback only if the code has been
diff --git a/kqemu.c b/kqemu.c
index 92b64a7..9c3d0c5 100644
--- a/kqemu.c
+++ b/kqemu.c
@@ -345,16 +345,6 @@ void kqemu_set_notdirty(ram_addr_t ram_addr)
ram_pages_to_update[nb_ram_pages_to_update++] = ram_addr;
}
-QEMUAccel kqemu_accel = {
- .cpu_interrupt = kqemu_cpu_interrupt,
- .init_env = kqemu_init_env,
- .flush_cache = kqemu_flush,
- .flush_page = kqemu_flush_page,
- .info = kqemu_info,
- .profile = kqemu_profile,
- .set_notdirty = kqemu_set_notdirty,
-};
-
static void kqemu_reset_modified_ram_pages(void)
{
int i;
@@ -367,7 +357,7 @@ static void kqemu_reset_modified_ram_pages(void)
nb_modified_ram_pages = 0;
}
-void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr)
+void kqemu_modify_page(ram_addr_t ram_addr, int dirty_flags)
{
unsigned long page_index;
int ret;
@@ -375,6 +365,8 @@ void kqemu_modify_page(CPUState *env, ram_addr_t ram_addr)
DWORD temp;
#endif
+ if ((dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
+ return;
page_index = ram_addr >> TARGET_PAGE_BITS;
if (!modified_ram_pages_table[page_index]) {
#if 0
@@ -443,6 +435,18 @@ void kqemu_set_phys_mem(uint64_t start_addr, ram_addr_t
size,
}
}
+QEMUAccel kqemu_accel = {
+ .cpu_interrupt = kqemu_cpu_interrupt,
+ .init_env = kqemu_init_env,
+ .flush_cache = kqemu_flush,
+ .flush_page = kqemu_flush_page,
+ .info = kqemu_info,
+ .profile = kqemu_profile,
+ .set_notdirty = kqemu_set_notdirty,
+ .modify_page = kqemu_modify_page,
+};
+
+
struct fpstate {
uint16_t fpuc;
uint16_t dummy1;
--
1.5.5.1
- [Qemu-devel] [PATCH 0/20] QEMU Accel patch, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 01/20] split kqemu_init into two, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 02/20] introduce QEMUAccel and fill it with interrupt specific driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 03/20] init env made accel driver, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 04/20] wrap cache flushing functions into accel drivers, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 05/20] turn info kqemu into generic info accelerator, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 06/20] separate accelerator part of info profiler, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 07/20] move kqemu externs to kqemu.h, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 08/20] move disabling code to kqemu.c instead of vl.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 09/20] set_notdirty goes through accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 10/20] wrap modify_page through accel calls,
Glauber Costa <=
- [Qemu-devel] [PATCH 11/20] remove kqemu reference from hw/pc.c, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 12/20] build list of available accelerators, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 13/20] decorate application name, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 14/20] tsc: kvm will use it, but it is pretty general, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 15/20] shift for masks., Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 16/20] small changes in headers needed to acomodate kvm files as is., Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 17/20] add hook to cpu_register_physical_memory, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 18/20] accel_trace_io, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 19/20] get_env accel wrapper, Glauber Costa, 2008/06/27
- [Qemu-devel] [PATCH 20/20] add next_cpu_index, Glauber Costa, 2008/06/27