gwj / at91sam9263 · Commits

Commit 2f3a1b072a9d0f5b87a857655926618cb43faac0

Authored by edgar_igl
1 parent 98156423

CRIS: helper_dummy no longer needed as barrier for qemu_ld/st. 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4416 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 0 additions and 13 deletions
target-cris/translate.c
  View file @2f3a1b0
@@ -1120,7 +1120,6 @@ void gen_load(DisasContext *dc, TCGv dst, TCGv addr, @@ -1120,7 +1120,6 @@ void gen_load(DisasContext *dc, TCGv dst, TCGv addr,
1120 { 1120 {
1121 int mem_index = cpu_mmu_index(dc->env); 1121 int mem_index = cpu_mmu_index(dc->env);
1122 1122
1123 - cris_evaluate_flags(dc);  
1124 if (size == 1) { 1123 if (size == 1) {
1125 if (sign) 1124 if (sign)
1126 tcg_gen_qemu_ld8s(dst, addr, mem_index); 1125 tcg_gen_qemu_ld8s(dst, addr, mem_index);
@@ -1276,8 +1275,6 @@ static int dec_prep_alu_m(DisasContext *dc, int s_ext, int memsize) @@ -1276,8 +1275,6 @@ static int dec_prep_alu_m(DisasContext *dc, int s_ext, int memsize)
1276 tcg_gen_movi_tl(cpu_T[1], imm); 1275 tcg_gen_movi_tl(cpu_T[1], imm);
1277 dc->postinc = 0; 1276 dc->postinc = 0;
1278 } else { 1277 } else {
1279 - /* FIXME: qemu_ld does not act as a barrier? */  
1280 - tcg_gen_helper_0_0(helper_dummy);  
1281 gen_load(dc, cpu_T[1], cpu_R[rs], memsize, 0); 1278 gen_load(dc, cpu_T[1], cpu_R[rs], memsize, 0);
1282 if (s_ext) 1279 if (s_ext)
1283 t_gen_sext(cpu_T[1], cpu_T[1], memsize); 1280 t_gen_sext(cpu_T[1], cpu_T[1], memsize);
@@ -2340,8 +2337,6 @@ static unsigned int dec_move_pm(DisasContext *dc) @@ -2340,8 +2337,6 @@ static unsigned int dec_move_pm(DisasContext *dc)
2340 cris_evaluate_flags(dc); 2337 cris_evaluate_flags(dc);
2341 t_gen_mov_TN_preg(cpu_T[1], dc->op2); 2338 t_gen_mov_TN_preg(cpu_T[1], dc->op2);
2342 2339
2343 - /* FIXME: qemu_st does not act as a barrier? */  
2344 - tcg_gen_helper_0_0(helper_dummy);  
2345 gen_store(dc, cpu_R[dc->op1], cpu_T[1], memsize); 2340 gen_store(dc, cpu_R[dc->op1], cpu_T[1], memsize);
2346 2341
2347 cris_cc_mask(dc, 0); 2342 cris_cc_mask(dc, 0);
@@ -2358,9 +2353,6 @@ static unsigned int dec_movem_mr(DisasContext *dc) @@ -2358,9 +2353,6 @@ static unsigned int dec_movem_mr(DisasContext *dc)
2358 DIS(fprintf (logfile, "movem [$r%u%s, $r%u\n", dc->op1, 2353 DIS(fprintf (logfile, "movem [$r%u%s, $r%u\n", dc->op1,
2359 dc->postinc ? "+]" : "]", dc->op2)); 2354 dc->postinc ? "+]" : "]", dc->op2));
2360 2355
2361 - /* FIXME: qemu_ld does not act as a barrier? */  
2362 - tcg_gen_helper_0_0(helper_dummy);  
2363 -  
2364 /* fetch the address into T0 and T1. */ 2356 /* fetch the address into T0 and T1. */
2365 for (i = 0; i <= dc->op2; i++) { 2357 for (i = 0; i <= dc->op2; i++) {
2366 tmp[i] = tcg_temp_new(TCG_TYPE_TL); 2358 tmp[i] = tcg_temp_new(TCG_TYPE_TL);
@@ -2390,9 +2382,6 @@ static unsigned int dec_movem_rm(DisasContext *dc) @@ -2390,9 +2382,6 @@ static unsigned int dec_movem_rm(DisasContext *dc)
2390 DIS(fprintf (logfile, "movem $r%u, [$r%u%s\n", dc->op2, dc->op1, 2382 DIS(fprintf (logfile, "movem $r%u, [$r%u%s\n", dc->op2, dc->op1,
2391 dc->postinc ? "+]" : "]")); 2383 dc->postinc ? "+]" : "]"));
2392 2384
2393 - /* FIXME: qemu_st does not act as a barrier? */  
2394 - tcg_gen_helper_0_0(helper_dummy);  
2395 -  
2396 for (i = 0; i <= dc->op2; i++) { 2385 for (i = 0; i <= dc->op2; i++) {
2397 /* Displace addr. */ 2386 /* Displace addr. */
2398 tcg_gen_addi_tl(cpu_T[0], cpu_R[dc->op1], i * 4); 2387 tcg_gen_addi_tl(cpu_T[0], cpu_R[dc->op1], i * 4);
@@ -2415,8 +2404,6 @@ static unsigned int dec_move_rm(DisasContext *dc) @@ -2415,8 +2404,6 @@ static unsigned int dec_move_rm(DisasContext *dc)
2415 memsize, dc->op2, dc->op1)); 2404 memsize, dc->op2, dc->op1));
2416 2405
2417 /* prepare store. */ 2406 /* prepare store. */
2418 - /* FIXME: qemu_st does not act as a barrier? */  
2419 - tcg_gen_helper_0_0(helper_dummy);  
2420 gen_store(dc, cpu_R[dc->op1], cpu_R[dc->op2], memsize); 2407 gen_store(dc, cpu_R[dc->op1], cpu_R[dc->op2], memsize);
2421 2408
2422 if (dc->postinc) 2409 if (dc->postinc)