[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 17/26] disas: nanoMIPS: Rename the decoder of 'gp
From: |
Aleksandar Markovic |
Subject: |
[Qemu-devel] [PATCH v6 17/26] disas: nanoMIPS: Rename the decoder of 'gpr4.zero' gpr encoding type |
Date: |
Thu, 27 Dec 2018 15:22:57 +0100 |
From: Aleksandar Markovic <address@hidden>
Rename the decoder of 'gpr4.zero' gpr encoding type in nanoMIPS
disassembler.
Signed-off-by: Aleksandar Markovic <address@hidden>
---
disas/nanomips.cpp | 10 +++++-----
disas/nanomips.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index 014ec06..f4acba8 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -396,7 +396,7 @@ uint64 NMD::encode_rd1_from_rd(uint64 d)
}
-uint64 NMD::encode_gpr4_zero(uint64 d)
+uint64 NMD::decode_gpr_gpr4_zero(uint64 d)
{
static uint64 register_list[] = { 8, 9, 10, 0, 4, 5, 6, 7,
16, 17, 18, 19, 20, 21, 22, 23 };
@@ -10391,7 +10391,7 @@ std::string NMD::MOVE_BALC(uint64 instruction)
int64 s_value = extract_s__se21_0_20_to_1_s1(instruction);
std::string rd1 = GPR(encode_rd1_from_rd(rd1_value));
- std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
+ std::string rtz4 = GPR(decode_gpr_gpr4_zero(rtz4_value));
std::string s = ADDRESS(encode_s_from_address(s_value), 4);
return img::format("MOVE.BALC %s, %s, %s", rd1, rtz4, s);
@@ -10417,8 +10417,8 @@ std::string NMD::MOVEP(uint64 instruction)
std::string rd2 = GPR(encode_rd2_reg1(rd2_value));
std::string re2 = GPR(encode_rd2_reg2(rd2_value));
/* !!!!!!!!!! - no conversion function */
- std::string rsz4 = GPR(encode_gpr4_zero(rsz4_value));
- std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
+ std::string rsz4 = GPR(decode_gpr_gpr4_zero(rsz4_value));
+ std::string rtz4 = GPR(decode_gpr_gpr4_zero(rtz4_value));
return img::format("MOVEP %s, %s, %s, %s", rd2, re2, rsz4, rtz4);
/* hand edited */
@@ -15284,7 +15284,7 @@ std::string NMD::SW_4X4_(uint64 instruction)
uint64 rs4_value = extract_rs4_4_2_1_0(instruction);
uint64 u_value = extract_u_3_8__s2(instruction);
- std::string rtz4 = GPR(encode_gpr4_zero(rtz4_value));
+ std::string rtz4 = GPR(decode_gpr_gpr4_zero(rtz4_value));
std::string u = IMMEDIATE(copy(u_value));
std::string rs4 = GPR(decode_gpr_gpr4(rs4_value));
diff --git a/disas/nanomips.h b/disas/nanomips.h
index 0734844..917f33e 100644
--- a/disas/nanomips.h
+++ b/disas/nanomips.h
@@ -108,7 +108,7 @@ private:
uint64 decode_gpr_gpr3(uint64 d);
uint64 decode_gpr_gpr3_src_store(uint64 d);
uint64 encode_rd1_from_rd(uint64 d);
- uint64 encode_gpr4_zero(uint64 d);
+ uint64 decode_gpr_gpr4_zero(uint64 d);
uint64 decode_gpr_gpr4(uint64 d);
uint64 encode_rd2_reg1(uint64 d);
uint64 encode_rd2_reg2(uint64 d);
--
2.7.4
- [Qemu-devel] [PATCH v6 11/26] disas: nanoMIPS: Rename the decoder of 'gpr3' gpr encoding type, (continued)
- [Qemu-devel] [PATCH v6 11/26] disas: nanoMIPS: Rename the decoder of 'gpr3' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 07/26] disas: nanoMIPS: Fix an FP-related misnomer 2, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 09/26] disas: nanoMIPS: Name more functions in a more descriptive way, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 16/26] disas: nanoMIPS: Comment the decoder of 'gpr4' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 18/26] disas: nanoMIPS: Comment the decoder of 'gpr4.zero' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 20/26] disas: nanoMIPS: Comment the decoder of 'gpr2.reg1' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 12/26] disas: nanoMIPS: Comment the decoder of 'gpr3' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 19/26] disas: nanoMIPS: Rename the decoder of 'gpr2.reg1' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 13/26] disas: nanoMIPS: Rename the decoder of 'gpr3.src.store' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 14/26] disas: nanoMIPS: Comment the decoder of 'gpr3.src.store' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 17/26] disas: nanoMIPS: Rename the decoder of 'gpr4.zero' gpr encoding type,
Aleksandar Markovic <=
- [Qemu-devel] [PATCH v6 25/26] disas: nanoMIPS: Reorder declarations and definitions of gpr decoders, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 21/26] disas: nanoMIPS: Rename the decoder of 'gpr2.reg2' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 23/26] disas: nanoMIPS: Rename the decoder of 'gpr1' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 15/26] disas: nanoMIPS: Rename the decoder of 'gpr4' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 22/26] disas: nanoMIPS: Comment the decoder of 'gpr2.reg2' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 10/26] disas: nanoMIPS: Fix order of more invocations, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 26/26] disas: nanoMIPS: Add a note on documentation, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 24/26] disas: nanoMIPS: Comment the decoder of 'gpr1' gpr encoding type, Aleksandar Markovic, 2018/12/27
- [Qemu-devel] [PATCH v6 04/26] disas: nanoMIPS: Fix order of some invocations, Aleksandar Markovic, 2018/12/27