[Qemu-devel] [PATCH 1/6] target/mips: nanoMIPS: Remove duplicate macro definitions

Aleksandar Markovic posted 6 patches 6 years, 9 months ago
Maintainers: Aleksandar Rikalo <arikalo@wavecomp.com>, Stefan Markovic <smarkovic@wavecomp.com>, Aurelien Jarno <aurelien@aurel32.net>, Aleksandar Markovic <amarkovic@wavecomp.com>
There is a newer version of this series
[Qemu-devel] [PATCH 1/6] target/mips: nanoMIPS: Remove duplicate macro definitions
Posted by Aleksandar Markovic 6 years, 9 months ago
From: Aleksandar Markovic <amarkovic@wavecomp.com>

Several macros were defined twice, with identical values.
Remove duplicates.

Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
 target/mips/translate.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/target/mips/translate.c b/target/mips/translate.c
index 057aaf9..fb2c42c 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -18433,16 +18433,6 @@ static inline int decode_gpr_gpr4_zero(int r)
 }
 
 
-/* extraction utilities */
-
-#define NANOMIPS_EXTRACT_RD(op) ((op >> 7) & 0x7)
-#define NANOMIPS_EXTRACT_RS(op) ((op >> 4) & 0x7)
-#define NANOMIPS_EXTRACT_RS2(op) uMIPS_RS(op)
-#define NANOMIPS_EXTRACT_RS1(op) ((op >> 1) & 0x7)
-#define NANOMIPS_EXTRACT_RD5(op) ((op >> 5) & 0x1f)
-#define NANOMIPS_EXTRACT_RS5(op) (op & 0x1f)
-
-
 static void gen_adjust_sp(DisasContext *ctx, int u)
 {
     gen_op_addr_addi(ctx, cpu_gpr[29], cpu_gpr[29], u);
-- 
2.7.4


Re: [Qemu-devel] [PATCH 1/6] target/mips: nanoMIPS: Remove duplicate macro definitions
Posted by Philippe Mathieu-Daudé 6 years, 9 months ago
On 1/21/19 8:08 PM, Aleksandar Markovic wrote:
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
> 
> Several macros were defined twice, with identical values.
> Remove duplicates.

"Previously added in 80845edf37b."

"This reverts commit 6bfa9f4c9cf24d6cfaaa227722e9cdcca1ad6fe9."

> 
> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> ---
>  target/mips/translate.c | 10 ----------
>  1 file changed, 10 deletions(-)
> 
> diff --git a/target/mips/translate.c b/target/mips/translate.c
> index 057aaf9..fb2c42c 100644
> --- a/target/mips/translate.c
> +++ b/target/mips/translate.c
> @@ -18433,16 +18433,6 @@ static inline int decode_gpr_gpr4_zero(int r)
>  }
>  
>  
> -/* extraction utilities */
> -
> -#define NANOMIPS_EXTRACT_RD(op) ((op >> 7) & 0x7)
> -#define NANOMIPS_EXTRACT_RS(op) ((op >> 4) & 0x7)
> -#define NANOMIPS_EXTRACT_RS2(op) uMIPS_RS(op)
> -#define NANOMIPS_EXTRACT_RS1(op) ((op >> 1) & 0x7)
> -#define NANOMIPS_EXTRACT_RD5(op) ((op >> 5) & 0x1f)
> -#define NANOMIPS_EXTRACT_RS5(op) (op & 0x1f)
> -
> -
>  static void gen_adjust_sp(DisasContext *ctx, int u)
>  {
>      gen_op_addr_addi(ctx, cpu_gpr[29], cpu_gpr[29], u);
>