translate-all: Change tb_check_watchpoint() argument to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
		
							parent
							
								
									74f10515d1
								
							
						
					
					
						commit
						239c51a54f
					
				
							
								
								
									
										2
									
								
								exec.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								exec.c
									
									
									
									
									
								
							@ -1605,7 +1605,7 @@ static void check_watchpoint(int offset, int len_mask, int flags)
 | 
				
			|||||||
            wp->flags |= BP_WATCHPOINT_HIT;
 | 
					            wp->flags |= BP_WATCHPOINT_HIT;
 | 
				
			||||||
            if (!cpu->watchpoint_hit) {
 | 
					            if (!cpu->watchpoint_hit) {
 | 
				
			||||||
                cpu->watchpoint_hit = wp;
 | 
					                cpu->watchpoint_hit = wp;
 | 
				
			||||||
                tb_check_watchpoint(env);
 | 
					                tb_check_watchpoint(cpu);
 | 
				
			||||||
                if (wp->flags & BP_STOP_BEFORE_ACCESS) {
 | 
					                if (wp->flags & BP_STOP_BEFORE_ACCESS) {
 | 
				
			||||||
                    cpu->exception_index = EXCP_DEBUG;
 | 
					                    cpu->exception_index = EXCP_DEBUG;
 | 
				
			||||||
                    cpu_loop_exit(cpu);
 | 
					                    cpu_loop_exit(cpu);
 | 
				
			||||||
 | 
				
			|||||||
@ -1371,9 +1371,9 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
#endif /* TARGET_HAS_ICE && !defined(CONFIG_USER_ONLY) */
 | 
					#endif /* TARGET_HAS_ICE && !defined(CONFIG_USER_ONLY) */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void tb_check_watchpoint(CPUArchState *env)
 | 
					void tb_check_watchpoint(CPUState *cpu)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    CPUState *cpu = ENV_GET_CPU(env);
 | 
					    CPUArchState *env = cpu->env_ptr;
 | 
				
			||||||
    TranslationBlock *tb;
 | 
					    TranslationBlock *tb;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    tb = tb_find_pc(cpu->mem_io_pc);
 | 
					    tb = tb_find_pc(cpu->mem_io_pc);
 | 
				
			||||||
 | 
				
			|||||||
@ -22,6 +22,6 @@
 | 
				
			|||||||
/* translate-all.c */
 | 
					/* translate-all.c */
 | 
				
			||||||
void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len);
 | 
					void tb_invalidate_phys_page_fast(tb_page_addr_t start, int len);
 | 
				
			||||||
void cpu_unlink_tb(CPUState *cpu);
 | 
					void cpu_unlink_tb(CPUState *cpu);
 | 
				
			||||||
void tb_check_watchpoint(CPUArchState *env);
 | 
					void tb_check_watchpoint(CPUState *cpu);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* TRANSLATE_ALL_H */
 | 
					#endif /* TRANSLATE_ALL_H */
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user