mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disas: nanoMIPS: Rename the decoder of 'gpr4' gpr encoding type

Browse Source 
Rename the decoder of 'gpr4' 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 2018-12-25 15:30:07 +01:00
parent 6ab8abfcde
commit 131e9b926a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
disas/nanomips.cpp
View File

@ -406,7 +406,7 @@ uint64 NMD::encode_gpr4_zero(uint64 d)
}
uint64 NMD::encode_gpr4(uint64 d)
uint64 NMD::decode_gpr_gpr4(uint64 d)
{
static uint64 register_list[] = { 8, 9, 10, 11, 4, 5, 6, 7,
16, 17, 18, 19, 20, 21, 22, 23 };
@ -2363,8 +2363,8 @@ std::string NMD::ADDU_4X4_(uint64 instruction)
uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
std::string rs4 = GPR(encode_gpr4(rs4_value));
std::string rt4 = GPR(encode_gpr4(rt4_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
std::string rt4 = GPR(decode_gpr_gpr4(rt4_value));
return img::format("ADDU %s, %s", rs4, rt4);
}
@ -9046,9 +9046,9 @@ std::string NMD::LW_4X4_(uint64 instruction)
uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
uint64 u_value = extract_u_3_8__s2(instruction);
std::string rt4 = GPR(encode_gpr4(rt4_value));
std::string rt4 = GPR(decode_gpr_gpr4(rt4_value));
std::string u = IMMEDIATE(copy(u_value));
std::string rs4 = GPR(encode_gpr4(rs4_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
return img::format("LW %s, %s(%s)", rt4, u, rs4);
}
@ -10419,8 +10419,8 @@ std::string NMD::MOVEP_REV_(uint64 instruction)
uint64 rd2_value = extract_rd2_3_8(instruction);
uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
std::string rs4 = GPR(encode_gpr4(rs4_value));
std::string rt4 = GPR(encode_gpr4(rt4_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
std::string rt4 = GPR(decode_gpr_gpr4(rt4_value));
std::string rd2 = GPR(encode_rd2_reg1(rd2_value));
std::string rs2 = GPR(encode_rd2_reg2(rd2_value));
/* !!!!!!!!!! - no conversion function */
@ -10985,8 +10985,8 @@ std::string NMD::MUL_4X4_(uint64 instruction)
uint64 rt4_value = extract_rt4_9_7_6_5(instruction);
uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
std::string rs4 = GPR(encode_gpr4(rs4_value));
std::string rt4 = GPR(encode_gpr4(rt4_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
std::string rt4 = GPR(decode_gpr_gpr4(rt4_value));
return img::format("MUL %s, %s", rs4, rt4);
}
@ -15264,7 +15264,7 @@ std::string NMD::SW_4X4_(uint64 instruction)
std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
std::string u = IMMEDIATE(copy(u_value));
std::string rs4 = GPR(encode_gpr4(rs4_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
return img::format("SW %s, %s(%s)", rtz4, u, rs4);
}

2
disas/nanomips.h
View File

@ -109,7 +109,7 @@ private:
uint64 decode_gpr_gpr3_src_store(uint64 d);
uint64 encode_rd1_from_rd(uint64 d);
uint64 encode_gpr4_zero(uint64 d);
uint64 encode_gpr4(uint64 d);
uint64 decode_gpr_gpr4(uint64 d);
uint64 encode_rd2_reg1(uint64 d);
uint64 encode_rd2_reg2(uint64 d);