From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KCKjm-00030N-9r for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KCKjk-0002z9-PC for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:05 -0400 Received: from [199.232.76.173] (port=51156 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KCKjk-0002z2-Kd for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:04 -0400 Received: from mx1.redhat.com ([66.187.233.31]:55946) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KCKjk-00080c-Tb for qemu-devel@nongnu.org; Fri, 27 Jun 2008 16:40:05 -0400 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m5RKe3tr014499 for ; Fri, 27 Jun 2008 16:40:03 -0400 Received: from pobox-2.corp.redhat.com (pobox-2.corp.redhat.com [10.11.255.15]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKe3mD005811 for ; Fri, 27 Jun 2008 16:40:03 -0400 Received: from localhost.localdomain (vpn-4-80.str.redhat.com [10.32.4.80]) by pobox-2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m5RKdadi004563 for ; Fri, 27 Jun 2008 16:40:01 -0400 From: Glauber Costa Date: Fri, 27 Jun 2008 17:38:13 -0300 Message-Id: <1214599103-13846-11-git-send-email-gcosta@redhat.com> In-Reply-To: <1214599103-13846-10-git-send-email-gcosta@redhat.com> References: <1214599103-13846-1-git-send-email-gcosta@redhat.com> <1214599103-13846-2-git-send-email-gcosta@redhat.com> <1214599103-13846-3-git-send-email-gcosta@redhat.com> <1214599103-13846-4-git-send-email-gcosta@redhat.com> <1214599103-13846-5-git-send-email-gcosta@redhat.com> <1214599103-13846-6-git-send-email-gcosta@redhat.com> <1214599103-13846-7-git-send-email-gcosta@redhat.com> <1214599103-13846-8-git-send-email-gcosta@redhat.com> <1214599103-13846-9-git-send-email-gcosta@redhat.com> <1214599103-13846-10-git-send-email-gcosta@redhat.com> Subject: [Qemu-devel] [PATCH 10/20] 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 --- 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