From 611d4f996f650294483ff4b01c3140651e2dd29c Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Sun, 1 Sep 2013 17:52:07 +0200 Subject: translate-all: Change tb_flush_jmp_cache() argument to CPUState Signed-off-by: Andreas Färber --- include/exec/cputlb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/exec/cputlb.h') diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index e21cb60442..e1eb4d92df 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -31,7 +31,7 @@ void tlb_set_dirty(CPUArchState *env, target_ulong vaddr); extern int tlb_flush_count; /* exec.c */ -void tb_flush_jmp_cache(CPUArchState *env, target_ulong addr); +void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); MemoryRegionSection * address_space_translate_for_iotlb(AddressSpace *as, hwaddr addr, hwaddr *xlat, -- cgit v1.2.3-55-g7522 From baea4fae7b6d75ce0d1aeb2be0a223c7be8f4161 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Tue, 3 Sep 2013 10:51:26 +0200 Subject: cputlb: Change tlb_unprotect_code_phys() argument to CPUState Note that the argument is unused. Signed-off-by: Andreas Färber --- cputlb.c | 2 +- include/exec/cputlb.h | 2 +- translate-all.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/exec/cputlb.h') diff --git a/cputlb.c b/cputlb.c index 6b2cdb201a..343ede2bbb 100644 --- a/cputlb.c +++ b/cputlb.c @@ -119,7 +119,7 @@ void tlb_protect_code(ram_addr_t ram_addr) /* update the TLB so that writes in physical page 'phys_addr' are no longer tested for self modifying code */ -void tlb_unprotect_code_phys(CPUArchState *env, ram_addr_t ram_addr, +void tlb_unprotect_code_phys(CPUState *cpu, ram_addr_t ram_addr, target_ulong vaddr) { cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE); diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index e1eb4d92df..31df03c525 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -22,7 +22,7 @@ #if !defined(CONFIG_USER_ONLY) /* cputlb.c */ void tlb_protect_code(ram_addr_t ram_addr); -void tlb_unprotect_code_phys(CPUArchState *env, ram_addr_t ram_addr, +void tlb_unprotect_code_phys(CPUState *cpu, ram_addr_t ram_addr, target_ulong vaddr); void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, uintptr_t start, uintptr_t length); diff --git a/translate-all.c b/translate-all.c index 0aa4f76432..e35fcbe86a 100644 --- a/translate-all.c +++ b/translate-all.c @@ -1007,7 +1007,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, { TranslationBlock *tb, *tb_next, *saved_tb; CPUState *cpu = current_cpu; -#if defined(TARGET_HAS_PRECISE_SMC) || !defined(CONFIG_USER_ONLY) +#if defined(TARGET_HAS_PRECISE_SMC) CPUArchState *env = NULL; #endif tb_page_addr_t tb_start, tb_end; @@ -1032,7 +1032,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, /* build code bitmap */ build_page_bitmap(p); } -#if defined(TARGET_HAS_PRECISE_SMC) || !defined(CONFIG_USER_ONLY) +#if defined(TARGET_HAS_PRECISE_SMC) if (cpu != NULL) { env = cpu->env_ptr; } @@ -1102,7 +1102,7 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, if (!p->first_tb) { invalidate_page_bitmap(p); if (is_cpu_write_access) { - tlb_unprotect_code_phys(env, start, cpu->mem_io_vaddr); + tlb_unprotect_code_phys(cpu, start, cpu->mem_io_vaddr); } } #endif -- cgit v1.2.3-55-g7522 From bb0e627a84752707e629fde5534558ac08e7c521 Mon Sep 17 00:00:00 2001 From: Andreas Färber Date: Tue, 3 Sep 2013 13:32:01 +0200 Subject: exec: Change memory_region_section_get_iotlb() argument to CPUState It no longer needs CPUArchState since moving watchpoints to CPUState. Signed-off-by: Andreas Färber --- cputlb.c | 2 +- exec.c | 3 +-- include/exec/cputlb.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'include/exec/cputlb.h') diff --git a/cputlb.c b/cputlb.c index 343ede2bbb..8a00330db3 100644 --- a/cputlb.c +++ b/cputlb.c @@ -261,7 +261,7 @@ void tlb_set_page(CPUArchState *env, target_ulong vaddr, } code_address = address; - iotlb = memory_region_section_get_iotlb(env, section, vaddr, paddr, xlat, + iotlb = memory_region_section_get_iotlb(cpu, section, vaddr, paddr, xlat, prot, &address); index = (vaddr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); diff --git a/exec.c b/exec.c index 7b377cdb70..82580c5e0d 100644 --- a/exec.c +++ b/exec.c @@ -799,14 +799,13 @@ static void cpu_physical_memory_set_dirty_tracking(bool enable) in_migration = enable; } -hwaddr memory_region_section_get_iotlb(CPUArchState *env, +hwaddr memory_region_section_get_iotlb(CPUState *cpu, MemoryRegionSection *section, target_ulong vaddr, hwaddr paddr, hwaddr xlat, int prot, target_ulong *address) { - CPUState *cpu = ENV_GET_CPU(env); hwaddr iotlb; CPUWatchpoint *wp; diff --git a/include/exec/cputlb.h b/include/exec/cputlb.h index 31df03c525..b8ecd6f68d 100644 --- a/include/exec/cputlb.h +++ b/include/exec/cputlb.h @@ -36,7 +36,7 @@ void tb_flush_jmp_cache(CPUState *cpu, target_ulong addr); MemoryRegionSection * address_space_translate_for_iotlb(AddressSpace *as, hwaddr addr, hwaddr *xlat, hwaddr *plen); -hwaddr memory_region_section_get_iotlb(CPUArchState *env, +hwaddr memory_region_section_get_iotlb(CPUState *cpu, MemoryRegionSection *section, target_ulong vaddr, hwaddr paddr, hwaddr xlat, -- cgit v1.2.3-55-g7522