From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KqCWO-0001TZ-1M for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:59:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KqCWJ-0001RT-NJ for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:59:01 -0400 Received: from [199.232.76.173] (port=36793 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KqCWJ-0001RG-2K for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:59 -0400 Received: from mx2.redhat.com ([66.187.237.31]:49479) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KqCWG-0001Km-Tt for qemu-devel@nongnu.org; Wed, 15 Oct 2008 15:58:58 -0400 From: Glauber Costa Date: Wed, 15 Oct 2008 19:55:07 -0200 Message-Id: <1224107718-19128-11-git-send-email-glommer@redhat.com> In-Reply-To: <1224107718-19128-1-git-send-email-glommer@redhat.com> References: <1224107718-19128-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 10/21] wrap modify_page through accel calls 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 Cc: aliguori@us.ibm.com, jan.kiszka@siemens.com, jes@sgi.com, avi@qumranet.com, Glauber Costa , dmitry.baryshkov@siemens.com From: Glauber Costa Yet another accel field: modify_page Signed-off-by: Glauber Costa --- accel.c | 1 + accel.h | 7 +++++++ exec-all.h | 2 +- exec.c | 27 ++++++++++++--------------- kqemu.c | 26 +++++++++++++++----------- 5 files changed, 36 insertions(+), 27 deletions(-) diff --git a/accel.c b/accel.c index 56718af..4cdfaf5 100644 --- a/accel.c +++ b/accel.c @@ -24,5 +24,6 @@ QEMUAccel noaccel = { .info = noaccel_info, .profile = accel_nop, .set_notdirty = accel_nop, + .modify_page = accel_nop, }; diff --git a/accel.h b/accel.h index d404327..1f0d41b 100644 --- a/accel.h +++ b/accel.h @@ -9,6 +9,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; @@ -53,4 +54,10 @@ static inline void accel_set_notdirty(target_ulong addr) { current_accel->set_notdirty(addr); } + +static inline void accel_modify_page(target_ulong addr, int dirty_flags) +{ + current_accel->modify_page(addr, dirty_flags); +} + #endif diff --git a/exec-all.h b/exec-all.h index 2769c27..d64d587 100644 --- a/exec-all.h +++ b/exec-all.h @@ -364,7 +364,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 a1a103b..b6f54c2 100644 --- a/exec.c +++ b/exec.c @@ -2384,12 +2384,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 @@ -2409,12 +2408,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 @@ -2434,12 +2432,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