disas: nanoMIPS: Rename the decoder of 'gpr3' gpr encoding type
Rename the decoder of 'gpr3' gpr encoding type in nanoMIPS disassembler. Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
This commit is contained in:
Aleksandar Markovic
parent
75199b402c
commit
988d6c897c
|
|
@ -296,7 +296,7 @@ uint64 NMD::renumber_registers(uint64 index, uint64 *register_list,
|
|||
* decode sections so they are based on the encode, the equivalent decode
|
||||
* functions need writing eventually.
|
||||
*/
|
||||
uint64 NMD::encode_gpr3(uint64 d)
|
||||
uint64 NMD::decode_gpr_gpr3(uint64 d)
|
||||
{
|
||||
static uint64 register_list[] = { 16, 17, 18, 19, 4, 5, 6, 7 };
|
||||
return renumber_registers(d, register_list,
|
||||
|
|
@ -381,14 +381,14 @@ int64 NMD::neg_copy(int64 d)
|
|||
/* strange wrapper around gpr3 */
|
||||
uint64 NMD::encode_rs3_and_check_rs3_ge_rt3(uint64 d)
|
||||
{
|
||||
return encode_gpr3(d);
|
||||
return decode_gpr_gpr3(d);
|
||||
}
|
||||
|
||||
|
||||
/* strange wrapper around gpr3 */
|
||||
uint64 NMD::encode_rs3_and_check_rs3_lt_rt3(uint64 d)
|
||||
{
|
||||
return encode_gpr3(d);
|
||||
return decode_gpr_gpr3(d);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1936,7 +1936,7 @@ std::string NMD::ADDIU_R1_SP_(uint64 instruction)
|
|||
uint64 u_value = extract_u_5_4_3_2_1_0__s2(instruction);
|
||||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
|
||||
return img::format("ADDIU %s, $%d, %s", rt3, 29, u);
|
||||
|
|
@ -1958,8 +1958,8 @@ std::string NMD::ADDIU_R2_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_2_1_0__s2(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
|
||||
return img::format("ADDIU %s, %s, %s", rt3, rs3, u);
|
||||
|
|
@ -2239,9 +2239,9 @@ std::string NMD::ADDU_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 rd3_value = extract_rd3_3_2_1(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rd3 = GPR(encode_gpr3(rd3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string rd3 = GPR(decode_gpr_gpr3(rd3_value));
|
||||
|
||||
return img::format("ADDU %s, %s, %s", rd3, rs3, rt3);
|
||||
}
|
||||
|
|
@ -2498,8 +2498,8 @@ std::string NMD::AND_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("AND %s, %s", rs3, rt3);
|
||||
}
|
||||
|
|
@ -2544,8 +2544,8 @@ std::string NMD::ANDI_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 eu_value = extract_eu_3_2_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string eu = IMMEDIATE(encode_eu_from_u_andi16(eu_value));
|
||||
|
||||
return img::format("ANDI %s, %s, %s", rt3, rs3, eu);
|
||||
|
|
@ -2879,7 +2879,7 @@ std::string NMD::BEQC_16_(uint64 instruction)
|
|||
uint64 u_value = extract_u_3_2_1_0__s1(instruction);
|
||||
|
||||
std::string rs3 = GPR(encode_rs3_and_check_rs3_lt_rt3(rs3_value));
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = ADDRESS(encode_u_from_address(u_value), 2);
|
||||
|
||||
return img::format("BEQC %s, %s, %s", rs3, rt3, u);
|
||||
|
|
@ -2949,7 +2949,7 @@ std::string NMD::BEQZC_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
int64 s_value = extract_s__se7_0_6_5_4_3_2_1_s1(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string s = ADDRESS(encode_s_from_address(s_value), 2);
|
||||
|
||||
return img::format("BEQZC %s, %s", rt3, s);
|
||||
|
|
@ -3165,7 +3165,7 @@ std::string NMD::BNEC_16_(uint64 instruction)
|
|||
uint64 u_value = extract_u_3_2_1_0__s1(instruction);
|
||||
|
||||
std::string rs3 = GPR(encode_rs3_and_check_rs3_ge_rt3(rs3_value));
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = ADDRESS(encode_u_from_address(u_value), 2);
|
||||
|
||||
return img::format("BNEC %s, %s, %s", rs3, rt3, u);
|
||||
|
|
@ -3235,7 +3235,7 @@ std::string NMD::BNEZC_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
int64 s_value = extract_s__se7_0_6_5_4_3_2_1_s1(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string s = ADDRESS(encode_s_from_address(s_value), 2);
|
||||
|
||||
return img::format("BNEZC %s, %s", rt3, s);
|
||||
|
|
@ -7785,9 +7785,9 @@ std::string NMD::LB_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("LB %s, %s(%s)", rt3, u, rs3);
|
||||
}
|
||||
|
|
@ -7903,9 +7903,9 @@ std::string NMD::LBU_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("LBU %s, %s(%s)", rt3, u, rs3);
|
||||
}
|
||||
|
|
@ -8377,9 +8377,9 @@ std::string NMD::LH_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_2_1__s1(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("LH %s, %s(%s)", rt3, u, rs3);
|
||||
}
|
||||
|
|
@ -8495,9 +8495,9 @@ std::string NMD::LHU_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_2_1__s1(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("LHU %s, %s(%s)", rt3, u, rs3);
|
||||
}
|
||||
|
|
@ -8708,7 +8708,7 @@ std::string NMD::LI_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 eu_value = extract_eu_6_5_4_3_2_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string eu = IMMEDIATE(encode_eu_from_s_li16(eu_value));
|
||||
|
||||
return img::format("LI %s, %s", rt3, eu);
|
||||
|
|
@ -8945,9 +8945,9 @@ std::string NMD::LW_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 u_value = extract_u_3_2_1_0__s2(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("LW %s, %s(%s)", rt3, u, rs3);
|
||||
}
|
||||
|
|
@ -9014,7 +9014,7 @@ std::string NMD::LW_GP16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 u_value = extract_u_6_5_4_3_2_1_0__s2(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
|
||||
return img::format("LW %s, %s($%d)", rt3, u, 28);
|
||||
|
|
@ -9463,9 +9463,9 @@ std::string NMD::LWXS_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 rd3_value = extract_rd3_3_2_1(instruction);
|
||||
|
||||
std::string rd3 = GPR(encode_gpr3(rd3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = IMMEDIATE(encode_gpr3(rt3_value));
|
||||
std::string rd3 = GPR(decode_gpr_gpr3(rd3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string rt3 = IMMEDIATE(decode_gpr_gpr3(rt3_value));
|
||||
|
||||
return img::format("LWXS %s, %s(%s)", rd3, rs3, rt3);
|
||||
}
|
||||
|
|
@ -11442,8 +11442,8 @@ std::string NMD::NOT_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("NOT %s, %s", rt3, rs3);
|
||||
}
|
||||
|
|
@ -11464,8 +11464,8 @@ std::string NMD::OR_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
|
||||
return img::format("OR %s, %s", rs3, rt3);
|
||||
}
|
||||
|
|
@ -12743,7 +12743,7 @@ std::string NMD::SB_16_(uint64 instruction)
|
|||
|
||||
std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("SB %s, %s(%s)", rtz3, u, rs3);
|
||||
}
|
||||
|
|
@ -13589,7 +13589,7 @@ std::string NMD::SH_16_(uint64 instruction)
|
|||
|
||||
std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("SH %s, %s(%s)", rtz3, u, rs3);
|
||||
}
|
||||
|
|
@ -14345,8 +14345,8 @@ std::string NMD::SLL_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 shift3_value = extract_shift3_2_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string shift3 = IMMEDIATE(encode_shift3_from_shift(shift3_value));
|
||||
|
||||
return img::format("SLL %s, %s, %s", rt3, rs3, shift3);
|
||||
|
|
@ -14649,8 +14649,8 @@ std::string NMD::SRL_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 shift3_value = extract_shift3_2_1_0(instruction);
|
||||
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string shift3 = IMMEDIATE(encode_shift3_from_shift(shift3_value));
|
||||
|
||||
return img::format("SRL %s, %s, %s", rt3, rs3, shift3);
|
||||
|
|
@ -14967,9 +14967,9 @@ std::string NMD::SUBU_16_(uint64 instruction)
|
|||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
uint64 rd3_value = extract_rd3_3_2_1(instruction);
|
||||
|
||||
std::string rd3 = GPR(encode_gpr3(rd3_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rd3 = GPR(decode_gpr_gpr3(rd3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
|
||||
return img::format("SUBU %s, %s, %s", rd3, rs3, rt3);
|
||||
}
|
||||
|
|
@ -15163,7 +15163,7 @@ std::string NMD::SW_16_(uint64 instruction)
|
|||
|
||||
std::string rtz3 = GPR(encode_gpr3_store(rtz3_value));
|
||||
std::string u = IMMEDIATE(copy(u_value));
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
|
||||
return img::format("SW %s, %s(%s)", rtz3, u, rs3);
|
||||
}
|
||||
|
|
@ -16267,8 +16267,8 @@ std::string NMD::XOR_16_(uint64 instruction)
|
|||
uint64 rt3_value = extract_rt3_9_8_7(instruction);
|
||||
uint64 rs3_value = extract_rs3_6_5_4(instruction);
|
||||
|
||||
std::string rs3 = GPR(encode_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(encode_gpr3(rt3_value));
|
||||
std::string rs3 = GPR(decode_gpr_gpr3(rs3_value));
|
||||
std::string rt3 = GPR(decode_gpr_gpr3(rt3_value));
|
||||
|
||||
return img::format("XOR %s, %s", rs3, rt3);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ private:
|
|||
|
||||
uint64 renumber_registers(uint64 index, uint64 *register_list,
|
||||
size_t register_list_size);
|
||||
uint64 encode_gpr3(uint64 d);
|
||||
uint64 decode_gpr_gpr3(uint64 d);
|
||||
uint64 encode_gpr3_store(uint64 d);
|
||||
uint64 encode_rd1_from_rd(uint64 d);
|
||||
uint64 encode_gpr4_zero(uint64 d);
|
||||
|
|
|
|||
Loading…
Reference in New Issue