target-alpha: remove amask helper
The direct use of helper_amask in translate.c was bogus (as env is not assigned). Directly code amask in tcg and remove the helper. Signed-off-by: Tristan Gingold <gingold@adacore.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7075 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									8579095b81
								
							
						
					
					
						commit
						1a1f7dbcf1
					
				@ -3,7 +3,6 @@
 | 
				
			|||||||
DEF_HELPER_0(tb_flush, void)
 | 
					DEF_HELPER_0(tb_flush, void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEF_HELPER_2(excp, void, int, int)
 | 
					DEF_HELPER_2(excp, void, int, int)
 | 
				
			||||||
DEF_HELPER_1(amask, i64, i64)
 | 
					 | 
				
			||||||
DEF_HELPER_0(load_pcc, i64)
 | 
					DEF_HELPER_0(load_pcc, i64)
 | 
				
			||||||
DEF_HELPER_0(rc, i64)
 | 
					DEF_HELPER_0(rc, i64)
 | 
				
			||||||
DEF_HELPER_0(rs, i64)
 | 
					DEF_HELPER_0(rs, i64)
 | 
				
			||||||
 | 
				
			|||||||
@ -37,21 +37,6 @@ void helper_excp (int excp, int error)
 | 
				
			|||||||
    cpu_loop_exit();
 | 
					    cpu_loop_exit();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
uint64_t helper_amask (uint64_t arg)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    switch (env->implver) {
 | 
					 | 
				
			||||||
    case IMPLVER_2106x:
 | 
					 | 
				
			||||||
        /* EV4, EV45, LCA, LCA45 & EV5 */
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    case IMPLVER_21164:
 | 
					 | 
				
			||||||
    case IMPLVER_21264:
 | 
					 | 
				
			||||||
    case IMPLVER_21364:
 | 
					 | 
				
			||||||
        arg &= ~env->amask;
 | 
					 | 
				
			||||||
        break;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
    return arg;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
uint64_t helper_load_pcc (void)
 | 
					uint64_t helper_load_pcc (void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    /* XXX: TODO */
 | 
					    /* XXX: TODO */
 | 
				
			||||||
 | 
				
			|||||||
@ -1160,9 +1160,20 @@ static always_inline int translate_one (DisasContext *ctx, uint32_t insn)
 | 
				
			|||||||
            /* AMASK */
 | 
					            /* AMASK */
 | 
				
			||||||
            if (likely(rc != 31)) {
 | 
					            if (likely(rc != 31)) {
 | 
				
			||||||
                if (islit)
 | 
					                if (islit)
 | 
				
			||||||
                    tcg_gen_movi_i64(cpu_ir[rc], helper_amask(lit));
 | 
					                    tcg_gen_movi_i64(cpu_ir[rc], lit);
 | 
				
			||||||
                else
 | 
					                else
 | 
				
			||||||
                    gen_helper_amask(cpu_ir[rc], cpu_ir[rb]);
 | 
					                    tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[rb]);
 | 
				
			||||||
 | 
					                switch (ctx->env->implver) {
 | 
				
			||||||
 | 
					                case IMPLVER_2106x:
 | 
				
			||||||
 | 
					                    /* EV4, EV45, LCA, LCA45 & EV5 */
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                case IMPLVER_21164:
 | 
				
			||||||
 | 
					                case IMPLVER_21264:
 | 
				
			||||||
 | 
					                case IMPLVER_21364:
 | 
				
			||||||
 | 
					                    tcg_gen_andi_i64(cpu_ir[rc], cpu_ir[rc],
 | 
				
			||||||
 | 
					                                     ~(uint64_t)ctx->amask);
 | 
				
			||||||
 | 
					                    break;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
        case 0x64:
 | 
					        case 0x64:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user