Commit 72e1f16f authored by Yongbok Kim's avatar Yongbok Kim Committed by Aleksandar Markovic
Browse files

target/mips: Fix data type for offset 



Offset can be larger than 16 bit from nanoMIPS,
and immediate field can be larger than 16 bits as well.

Signed-off-by: default avatarYongbok Kim <yongbok.kim@mips.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarAleksandar Markovic <aleksandar.markovic@mips.com>
Signed-off-by: default avatarAleksandar Markovic <aleksandar.markovic@mips.com>
parent b52d3bfa

target/mips/translate.c

+4 −4
Original line number Diff line number Diff line
@@ -2112,7 +2112,7 @@ OP_ST_ATOMIC(scd,st64,ld64,0x7); 
#undef OP_ST_ATOMIC









static void gen_base_offset_addr (DisasContext *ctx, TCGv addr,









                                  int base, int16_t offset)









                                  int base, int offset)









{









    if (base == 0) {









        tcg_gen_movi_tl(addr, offset);








@@ -2140,7 +2140,7 @@ static target_ulong pc_relative_pc (DisasContext *ctx)















/* Load */









static void gen_ld(DisasContext *ctx, uint32_t opc,









                   int rt, int base, int16_t offset)









                   int rt, int base, int offset)









{









    TCGv t0, t1, t2;









    int mem_idx = ctx->mem_idx;








@@ -2337,7 +2337,7 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,















/* Store */









static void gen_st (DisasContext *ctx, uint32_t opc, int rt,









                    int base, int16_t offset)









                    int base, int offset)









{









    TCGv t0 = tcg_temp_new();









    TCGv t1 = tcg_temp_new();








@@ -2505,7 +2505,7 @@ static void gen_cop1_ldst(DisasContext *ctx, uint32_t op, int rt,















/* Arithmetic with immediate operand */









static void gen_arith_imm(DisasContext *ctx, uint32_t opc,









                          int rt, int rs, int16_t imm)









                          int rt, int rs, int imm)









{









    target_ulong uimm = (target_long)imm; /* Sign extend to 32/64 bits */