[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/6] Modifies wrapper functions for byte-based ph
From: |
Yoshiaki Tamura |
Subject: |
[Qemu-devel] [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap. |
Date: |
Tue, 6 Apr 2010 09:51:21 +0900 |
Signed-off-by: Yoshiaki Tamura <address@hidden>
Signed-off-by: OHMURA Kei <address@hidden>
---
cpu-all.h | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/cpu-all.h b/cpu-all.h
index c409fad..0f5bfbe 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -891,43 +891,96 @@ extern unsigned long *phys_ram_dirty[NUM_DIRTY_FLAGS];
/* read dirty bit (return 0 or 1) */
static inline int cpu_physical_memory_is_dirty(ram_addr_t addr)
{
- return phys_ram_dirty[addr >> TARGET_PAGE_BITS] == 0xff;
+ unsigned long mask;
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+
+ mask = 1UL << offset;
+ return (phys_ram_dirty[MASTER_DIRTY_FLAG][index] & mask) == mask;
}
static inline int cpu_physical_memory_get_dirty_flags(ram_addr_t addr)
{
- return phys_ram_dirty[addr >> TARGET_PAGE_BITS];
+ unsigned long mask;
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+ int ret = 0;
+
+ mask = 1UL << offset;
+ if (phys_ram_dirty[MASTER_DIRTY_FLAG][index] & mask)
+ return 0xff;
+ if (phys_ram_dirty[VGA_DIRTY_FLAG][index] & mask)
+ ret |= VGA_DIRTY_FLAG;
+ if (phys_ram_dirty[CODE_DIRTY_FLAG][index] & mask)
+ ret |= CODE_DIRTY_FLAG;
+ if (phys_ram_dirty[MIGRATION_DIRTY_FLAG][index] & mask)
+ ret |= MIGRATION_DIRTY_FLAG;
+
+ return ret;
}
static inline int cpu_physical_memory_get_dirty(ram_addr_t addr,
int dirty_flags)
{
- return phys_ram_dirty[addr >> TARGET_PAGE_BITS] & dirty_flags;
+ unsigned long mask;
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+
+ mask = 1UL << offset;
+ return (phys_ram_dirty[MASTER_DIRTY_FLAG][index] & mask) ||
+ (phys_ram_dirty[dirty_flags][index] & mask);
}
static inline void cpu_physical_memory_set_dirty(ram_addr_t addr)
{
- phys_ram_dirty[addr >> TARGET_PAGE_BITS] = 0xff;
+ unsigned long mask;
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+
+ mask = 1UL << offset;
+ phys_ram_dirty[MASTER_DIRTY_FLAG][index] |= mask;
+}
+
+static inline void cpu_physical_memory_set_dirty_range(ram_addr_t addr,
+ unsigned long mask)
+{
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+
+ phys_ram_dirty[MASTER_DIRTY_FLAG][index] |= mask;
}
-static inline int cpu_physical_memory_set_dirty_flags(ram_addr_t addr,
- int dirty_flags)
+static inline void cpu_physical_memory_set_dirty_flags(ram_addr_t addr,
+ int dirty_flags)
{
- return phys_ram_dirty[addr >> TARGET_PAGE_BITS] |= dirty_flags;
+ unsigned long mask;
+ int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+
+ mask = 1UL << offset;
+ if (dirty_flags & VGA_DIRTY_FLAG)
+ phys_ram_dirty[VGA_DIRTY_FLAG][index] |= mask;
+ if (dirty_flags & CODE_DIRTY_FLAG)
+ phys_ram_dirty[CODE_DIRTY_FLAG][index] |= mask;
+ if (dirty_flags & MIGRATION_DIRTY_FLAG)
+ phys_ram_dirty[MIGRATION_DIRTY_FLAG][index] |= mask;
}
static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start,
int length,
int dirty_flags)
{
- int i, mask, len;
- uint8_t *p;
+ ram_addr_t addr = start;
+ unsigned long mask;
+ int index, offset, i;
+
+ for (i = 0; i < length; i += TARGET_PAGE_SIZE) {
+ index = ((addr + i) >> TARGET_PAGE_BITS) / HOST_LONG_BITS;
+ offset = ((addr + i) >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1);
+ mask = ~(1UL << offset);
- len = length >> TARGET_PAGE_BITS;
- mask = ~dirty_flags;
- p = phys_ram_dirty + (start >> TARGET_PAGE_BITS);
- for (i = 0; i < len; i++)
- p[i] &= mask;
+ phys_ram_dirty[MASTER_DIRTY_FLAG][index] &= mask;
+ phys_ram_dirty[dirty_flags][index] &= mask;
+ }
}
void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
--
1.7.0.31.g1df487
- [Qemu-devel] [PATCH v2 0/6] Introduce bit-based phys_ram_dirty, and bit-based dirty page checker., Yoshiaki Tamura, 2010/04/05
- [Qemu-devel] [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap.,
Yoshiaki Tamura <=
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Avi Kivity, 2010/04/12
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Yoshiaki Tamura, 2010/04/12
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Avi Kivity, 2010/04/12
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Yoshiaki Tamura, 2010/04/13
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Avi Kivity, 2010/04/13
- [Qemu-devel] Re: [PATCH v2 3/6] Modifies wrapper functions for byte-based phys_ram_dirty bitmap to bit-based phys_ram_dirty bitmap., Yoshiaki Tamura, 2010/04/13
[Qemu-devel] [PATCH v2 4/6] Introduce cpu_physical_memory_get_dirty_range()., Yoshiaki Tamura, 2010/04/05
[Qemu-devel] [PATCH v2 1/6] Modify DIRTY_FLAG value to use as indexes of bit-based phys_ram_dirty., Yoshiaki Tamura, 2010/04/05
[Qemu-devel] [PATCH v2 5/6] Use cpu_physical_memory_set_dirty_range() to update phys_ram_dirty., Yoshiaki Tamura, 2010/04/05