falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dirty bitmap: abstract its use 

Always use accessors to read/set the dirty bitmap.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2012-06-22 13:14:17 +02:00
parent 4508bd9ed8
commit 1720aeee72
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
exec-obsolete.h
View File

@ -45,57 +45,61 @@ int cpu_physical_memory_set_dirty_tracking(int enable);
#define CODE_DIRTY_FLAG 0x02 #define CODE_DIRTY_FLAG 0x02
#define MIGRATION_DIRTY_FLAG 0x08 #define MIGRATION_DIRTY_FLAG 0x08
/* read dirty bit (return 0 or 1) */
static inline int cpu_physical_memory_is_dirty(ram_addr_t addr)
{
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] == 0xff;
}
static inline int cpu_physical_memory_get_dirty_flags(ram_addr_t addr) static inline int cpu_physical_memory_get_dirty_flags(ram_addr_t addr)
{ {
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS]; return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS];
} }
/* read dirty bit (return 0 or 1) */
static inline int cpu_physical_memory_is_dirty(ram_addr_t addr)
{
return cpu_physical_memory_get_dirty_flags(addr) == 0xff;
}
static inline int cpu_physical_memory_get_dirty(ram_addr_t start, static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
ram_addr_t length, ram_addr_t length,
int dirty_flags) int dirty_flags)
{ {
int ret = 0; int ret = 0;
uint8_t *p;
ram_addr_t addr, end; ram_addr_t addr, end;
end = TARGET_PAGE_ALIGN(start + length); end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK; start &= TARGET_PAGE_MASK;
p = ram_list.phys_dirty + (start >> TARGET_PAGE_BITS);
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
ret |= *p++ & dirty_flags; ret |= cpu_physical_memory_get_dirty_flags(addr) & dirty_flags;
} }
return ret; return ret;
} }
static inline void cpu_physical_memory_set_dirty(ram_addr_t addr)
{
ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] = 0xff;
}
static inline int cpu_physical_memory_set_dirty_flags(ram_addr_t addr, static inline int cpu_physical_memory_set_dirty_flags(ram_addr_t addr,
int dirty_flags) int dirty_flags)
{ {
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= dirty_flags; return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= dirty_flags;
} }
static inline void cpu_physical_memory_set_dirty(ram_addr_t addr)
{
cpu_physical_memory_set_dirty_flags(addr, 0xff);
}
static inline int cpu_physical_memory_clear_dirty_flags(ram_addr_t addr,
int dirty_flags)
{
int mask = ~dirty_flags;
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask;
}
static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
ram_addr_t length, ram_addr_t length,
int dirty_flags) int dirty_flags)
{ {
uint8_t *p;
ram_addr_t addr, end; ram_addr_t addr, end;
end = TARGET_PAGE_ALIGN(start + length); end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK; start &= TARGET_PAGE_MASK;
p = ram_list.phys_dirty + (start >> TARGET_PAGE_BITS);
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
*p++ |= dirty_flags; cpu_physical_memory_set_dirty_flags(addr, dirty_flags);
} }
} }
@ -103,16 +107,12 @@ static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start,
ram_addr_t length, ram_addr_t length,
int dirty_flags) int dirty_flags)
{ {
int mask;
uint8_t *p;
ram_addr_t addr, end; ram_addr_t addr, end;
end = TARGET_PAGE_ALIGN(start + length); end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK; start &= TARGET_PAGE_MASK;
mask = ~dirty_flags;
p = ram_list.phys_dirty + (start >> TARGET_PAGE_BITS);
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
*p++ &= mask; cpu_physical_memory_clear_dirty_flags(addr, dirty_flags);
} }
} }

3
exec.c
View File

@ -2565,8 +2565,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
ram_list.phys_dirty = g_realloc(ram_list.phys_dirty, ram_list.phys_dirty = g_realloc(ram_list.phys_dirty,
last_ram_offset() >> TARGET_PAGE_BITS); last_ram_offset() >> TARGET_PAGE_BITS);
memset(ram_list.phys_dirty + (new_block->offset >> TARGET_PAGE_BITS), cpu_physical_memory_set_dirty_range(new_block->offset, size, 0xff);
0xff, size >> TARGET_PAGE_BITS);
if (kvm_enabled()) if (kvm_enabled())
kvm_setup_guest_memory(new_block->host, size); kvm_setup_guest_memory(new_block->host, size);