gwj / at91sam9263 · Commits

Commit 0a6f8a6dd2e07ca7b15b690df8333958c14b2c47

Authored by edgar_igl
1 parent 572c8952

CRIS: Remove CRIS specific do_unassigned_access. 

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6140 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 6 additions and 15 deletions
@@ -2379,7 +2379,7 @@ static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr) @@ -2379,7 +2379,7 @@ static uint32_t unassigned_mem_readb(void *opaque, target_phys_addr_t addr)
2379 #ifdef DEBUG_UNASSIGNED 2379 #ifdef DEBUG_UNASSIGNED
2380 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); 2380 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
2381 #endif 2381 #endif
2382 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2382 +#if defined(TARGET_SPARC)
2383 do_unassigned_access(addr, 0, 0, 0, 1); 2383 do_unassigned_access(addr, 0, 0, 0, 1);
2384 #endif 2384 #endif
2385 return 0; 2385 return 0;
@@ -2390,7 +2390,7 @@ static uint32_t unassigned_mem_readw(void *opaque, target_phys_addr_t addr) @@ -2390,7 +2390,7 @@ static uint32_t unassigned_mem_readw(void *opaque, target_phys_addr_t addr)
2390 #ifdef DEBUG_UNASSIGNED 2390 #ifdef DEBUG_UNASSIGNED
2391 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); 2391 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
2392 #endif 2392 #endif
2393 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2393 +#if defined(TARGET_SPARC)
2394 do_unassigned_access(addr, 0, 0, 0, 2); 2394 do_unassigned_access(addr, 0, 0, 0, 2);
2395 #endif 2395 #endif
2396 return 0; 2396 return 0;
@@ -2401,7 +2401,7 @@ static uint32_t unassigned_mem_readl(void *opaque, target_phys_addr_t addr) @@ -2401,7 +2401,7 @@ static uint32_t unassigned_mem_readl(void *opaque, target_phys_addr_t addr)
2401 #ifdef DEBUG_UNASSIGNED 2401 #ifdef DEBUG_UNASSIGNED
2402 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr); 2402 printf("Unassigned mem read " TARGET_FMT_plx "\n", addr);
2403 #endif 2403 #endif
2404 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2404 +#if defined(TARGET_SPARC)
2405 do_unassigned_access(addr, 0, 0, 0, 4); 2405 do_unassigned_access(addr, 0, 0, 0, 4);
2406 #endif 2406 #endif
2407 return 0; 2407 return 0;
@@ -2412,7 +2412,7 @@ static void unassigned_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_ @@ -2412,7 +2412,7 @@ static void unassigned_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_
2412 #ifdef DEBUG_UNASSIGNED 2412 #ifdef DEBUG_UNASSIGNED
2413 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); 2413 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
2414 #endif 2414 #endif
2415 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2415 +#if defined(TARGET_SPARC)
2416 do_unassigned_access(addr, 1, 0, 0, 1); 2416 do_unassigned_access(addr, 1, 0, 0, 1);
2417 #endif 2417 #endif
2418 } 2418 }
@@ -2422,7 +2422,7 @@ static void unassigned_mem_writew(void *opaque, target_phys_addr_t addr, uint32_ @@ -2422,7 +2422,7 @@ static void unassigned_mem_writew(void *opaque, target_phys_addr_t addr, uint32_
2422 #ifdef DEBUG_UNASSIGNED 2422 #ifdef DEBUG_UNASSIGNED
2423 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); 2423 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
2424 #endif 2424 #endif
2425 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2425 +#if defined(TARGET_SPARC)
2426 do_unassigned_access(addr, 1, 0, 0, 2); 2426 do_unassigned_access(addr, 1, 0, 0, 2);
2427 #endif 2427 #endif
2428 } 2428 }
@@ -2432,7 +2432,7 @@ static void unassigned_mem_writel(void *opaque, target_phys_addr_t addr, uint32_ @@ -2432,7 +2432,7 @@ static void unassigned_mem_writel(void *opaque, target_phys_addr_t addr, uint32_
2432 #ifdef DEBUG_UNASSIGNED 2432 #ifdef DEBUG_UNASSIGNED
2433 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val); 2433 printf("Unassigned mem write " TARGET_FMT_plx " = 0x%x\n", addr, val);
2434 #endif 2434 #endif
2435 -#if defined(TARGET_SPARC) || defined(TARGET_CRIS) 2435 +#if defined(TARGET_SPARC)
2436 do_unassigned_access(addr, 1, 0, 0, 4); 2436 do_unassigned_access(addr, 1, 0, 0, 4);
2437 #endif 2437 #endif
2438 } 2438 }
target-cris/cpu.h
  View file @0a6f8a6
@@ -167,8 +167,6 @@ void do_interrupt(CPUCRISState *env); @@ -167,8 +167,6 @@ void do_interrupt(CPUCRISState *env);
167 is returned if the signal was handled by the virtual CPU. */ 167 is returned if the signal was handled by the virtual CPU. */
168 int cpu_cris_signal_handler(int host_signum, void *pinfo, 168 int cpu_cris_signal_handler(int host_signum, void *pinfo,
169 void *puc); 169 void *puc);
170 -void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,  
171 - int is_asi, int size);  
172 170
173 enum { 171 enum {
174 CC_OP_DYNAMIC, /* Use env->cc_op */ 172 CC_OP_DYNAMIC, /* Use env->cc_op */
target-cris/op_helper.c
  View file @0a6f8a6
@@ -243,13 +243,6 @@ void helper_rfn(void) @@ -243,13 +243,6 @@ void helper_rfn(void)
243 env->pregs[PR_CCS] |= M_FLAG; 243 env->pregs[PR_CCS] |= M_FLAG;
244 } 244 }
245 245
246 -void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec,  
247 - int is_asi, int size)  
248 -{  
249 - D(printf("%s addr=%x w=%d ex=%d asi=%d, size=%d\n",  
250 - __func__, addr, is_write, is_exec, is_asi, size));  
251 -}  
252 -  
253 static void evaluate_flags_writeback(uint32_t flags) 246 static void evaluate_flags_writeback(uint32_t flags)
254 { 247 {
255 int x; 248 int x;