aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Markovic <amarkovic@wavecomp.com>2018-12-26 14:40:17 +0100
committerAleksandar Markovic <amarkovic@wavecomp.com>2019-01-03 17:52:52 +0100
commitce0f2617acf1586931bf4d6525311eae46017c37 (patch)
treeec7abe1e271fd9ae8eb0c106517173e537bfe813
parent8e2919f66666496ae33af0caeca6f0a20faa5828 (diff)
disas: nanoMIPS: Rename the decoder of 'gpr2.reg2' gpr encoding type
Rename the decoder of 'gpr2.reg2' gpr encoding type in nanoMIPS disassembler. Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
-rw-r--r--disas/nanomips.cpp6
-rw-r--r--disas/nanomips.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index c3b2bec943..06d2400284 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -498,7 +498,7 @@ uint64 NMD::decode_gpr_gpr2_reg1(uint64 d)
}
-uint64 NMD::encode_rd2_reg2(uint64 d)
+uint64 NMD::decode_gpr_gpr2_reg2(uint64 d)
{
static uint64 register_list[] = { 5, 6, 7, 8 };
return renumber_registers(d, register_list,
@@ -10468,7 +10468,7 @@ std::string NMD::MOVEP(uint64 instruction)
uint64 rsz4_value = extract_rsz4_4_2_1_0(instruction);
std::string rd2 = GPR(decode_gpr_gpr2_reg1(rd2_value));
- std::string re2 = GPR(encode_rd2_reg2(rd2_value));
+ std::string re2 = GPR(decode_gpr_gpr2_reg2(rd2_value));
/* !!!!!!!!!! - no conversion function */
std::string rsz4 = GPR(decode_gpr_gpr4_zero(rsz4_value));
std::string rtz4 = GPR(decode_gpr_gpr4_zero(rtz4_value));
@@ -10497,7 +10497,7 @@ std::string NMD::MOVEP_REV_(uint64 instruction)
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
std::string rt4 = GPR(decode_gpr_gpr4(rt4_value));
std::string rd2 = GPR(decode_gpr_gpr2_reg1(rd2_value));
- std::string rs2 = GPR(encode_rd2_reg2(rd2_value));
+ std::string rs2 = GPR(decode_gpr_gpr2_reg2(rd2_value));
/* !!!!!!!!!! - no conversion function */
return img::format("MOVEP %s, %s, %s, %s", rs4, rt4, rd2, rs2);
diff --git a/disas/nanomips.h b/disas/nanomips.h
index d928757ea3..9df1ab2487 100644
--- a/disas/nanomips.h
+++ b/disas/nanomips.h
@@ -111,7 +111,7 @@ private:
uint64 decode_gpr_gpr4_zero(uint64 d);
uint64 decode_gpr_gpr4(uint64 d);
uint64 decode_gpr_gpr2_reg1(uint64 d);
- uint64 encode_rd2_reg2(uint64 d);
+ uint64 decode_gpr_gpr2_reg2(uint64 d);
uint64 copy(uint64 d);
int64 copy(int64 d);