1. Patchew
  2. QEMU
  3. [PATCH 0/20] Convert nanoMIPS disassembler from C++ to C
  4. View patch

[PATCH 19/20] disas/nanomips: Add modifier static

Milica Lazarevic posted 20 patches 3 years, 5 months ago
Maintainers: Stefan Pejic <stefan.pejic@syrmia.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>
There is a newer version of this series
[PATCH 19/20] disas/nanomips: Add modifier static
Posted by Milica Lazarevic 3 years, 5 months ago 
Modifier static has been added to the remaining functions that shouldn't
be used outside of the nanomips disassembler.

Signed-off-by: Milica Lazarevic <milica.lazarevic@syrmia.com>
---
 disas/nanomips.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index e7d6bffe84..6cb527d1f7 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -114,13 +114,13 @@ static const char *to_string(img_address a)
 }
 
 
-uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
+static uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
 {
     return (data << (64 - (bit_size + bit_offset))) >> (64 - bit_size);
 }
 
 
-int64 sign_extend(int64 data, int msb)
+static int64 sign_extend(int64 data, int msb)
 {
     uint64 shift = 63 - msb;
     return (data << shift) >> shift;
@@ -463,7 +463,7 @@ static uint64 encode_shift3_from_shift(uint64 d)
 
 
 /* special value for load literal */
-int64 encode_eu_from_s_li16(uint64 d)
+static int64 encode_eu_from_s_li16(uint64 d)
 {
     IMGASSERTONCE(d < 128);
     return d == 127 ? -1 : (int64)d;
@@ -22780,7 +22780,7 @@ static struct Pool MAJOR[2] = {
 };
 
 
-int nanomips_dis(char *buf,
+static int nanomips_dis(char *buf,
                  unsigned address,
                  unsigned short one,
                  unsigned short two,
-- 
2.25.1
Re: [PATCH 19/20] disas/nanomips: Add modifier static
Posted by Thomas Huth 3 years, 5 months ago 
On 15/08/2022 09.26, Milica Lazarevic wrote:
> Modifier static has been added to the remaining functions that shouldn't
> be used outside of the nanomips disassembler.
> 
> Signed-off-by: Milica Lazarevic <milica.lazarevic@syrmia.com>
> ---
>   disas/nanomips.cpp | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
Re: [PATCH 19/20] disas/nanomips: Add modifier static
Posted by Philippe Mathieu-Daudé via 3 years, 5 months ago 
On 15/8/22 09:26, Milica Lazarevic wrote:
> Modifier static has been added to the remaining functions that shouldn't
> be used outside of the nanomips disassembler.
> 
> Signed-off-by: Milica Lazarevic <milica.lazarevic@syrmia.com>
> ---
>   disas/nanomips.cpp | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
> index e7d6bffe84..6cb527d1f7 100644
> --- a/disas/nanomips.cpp
> +++ b/disas/nanomips.cpp
> @@ -114,13 +114,13 @@ static const char *to_string(img_address a)
>   }
>   
>   
> -uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
> +static uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
>   {
>       return (data << (64 - (bit_size + bit_offset))) >> (64 - bit_size);
>   }
>   
>   
> -int64 sign_extend(int64 data, int msb)
> +static int64 sign_extend(int64 data, int msb)
>   {
>       uint64 shift = 63 - msb;
>       return (data << shift) >> shift;
> @@ -463,7 +463,7 @@ static uint64 encode_shift3_from_shift(uint64 d)
>   
>   
>   /* special value for load literal */
> -int64 encode_eu_from_s_li16(uint64 d)
> +static int64 encode_eu_from_s_li16(uint64 d)
>   {
>       IMGASSERTONCE(d < 128);
>       return d == 127 ? -1 : (int64)d;
> @@ -22780,7 +22780,7 @@ static struct Pool MAJOR[2] = {
>   };
>   
>   
> -int nanomips_dis(char *buf,
> +static int nanomips_dis(char *buf,
>                    unsigned address,
>                    unsigned short one,
>                    unsigned short two,

This seems to belong to patch #4 "Remove helper methods from class",
shouldn't this be squashed there?
Re: [PATCH 19/20] disas/nanomips: Add modifier static
Posted by Milica Lazarevic 3 years, 5 months ago 
Yes, it should. I'll squash it in the next version, thanks.

Milica
________________________________
From: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com> on behalf of Philippe Mathieu-Daudé <f4bug@amsat.org>
Sent: Tuesday, August 16, 2022 2:22 AM
To: Milica Lazarevic <Milica.Lazarevic@Syrmia.com>; thuth@redhat.com <thuth@redhat.com>
Cc: qemu-devel@nongnu.org <qemu-devel@nongnu.org>; cfontana@suse.de <cfontana@suse.de>; berrange@redhat.com <berrange@redhat.com>; pbonzini@redhat.com <pbonzini@redhat.com>; vince.delvecchio@mediatek.com <vince.delvecchio@mediatek.com>; richard.henderson@linaro.org <richard.henderson@linaro.org>; peter.maydell@linaro.org <peter.maydell@linaro.org>; Djordje Todorovic <Djordje.Todorovic@syrmia.com>; mips32r2@gmail.com <mips32r2@gmail.com>; Dragan Mladjenovic <Dragan.Mladjenovic@syrmia.com>
Subject: Re: [PATCH 19/20] disas/nanomips: Add modifier static

On 15/8/22 09:26, Milica Lazarevic wrote:
> Modifier static has been added to the remaining functions that shouldn't
> be used outside of the nanomips disassembler.
>
> Signed-off-by: Milica Lazarevic <milica.lazarevic@syrmia.com>
> ---
>   disas/nanomips.cpp | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
> index e7d6bffe84..6cb527d1f7 100644
> --- a/disas/nanomips.cpp
> +++ b/disas/nanomips.cpp
> @@ -114,13 +114,13 @@ static const char *to_string(img_address a)
>   }
>
>
> -uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
> +static uint64 extract_bits(uint64 data, uint32 bit_offset, uint32 bit_size)
>   {
>       return (data << (64 - (bit_size + bit_offset))) >> (64 - bit_size);
>   }
>
>
> -int64 sign_extend(int64 data, int msb)
> +static int64 sign_extend(int64 data, int msb)
>   {
>       uint64 shift = 63 - msb;
>       return (data << shift) >> shift;
> @@ -463,7 +463,7 @@ static uint64 encode_shift3_from_shift(uint64 d)
>
>
>   /* special value for load literal */
> -int64 encode_eu_from_s_li16(uint64 d)
> +static int64 encode_eu_from_s_li16(uint64 d)
>   {
>       IMGASSERTONCE(d < 128);
>       return d == 127 ? -1 : (int64)d;
> @@ -22780,7 +22780,7 @@ static struct Pool MAJOR[2] = {
>   };
>
>
> -int nanomips_dis(char *buf,
> +static int nanomips_dis(char *buf,
>                    unsigned address,
>                    unsigned short one,
>                    unsigned short two,

This seems to belong to patch #4 "Remove helper methods from class",
shouldn't this be squashed there?

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.