[PATCH 0/2] s390: Minor cleanups

[PATCH 0/2] s390: Minor cleanups

[Jens Remus]

This patch series contains minor cleanups to my my latest patches that
have already been committed to master.

Jens Remus (2):
  s390: Whitespace fixes in conditional branch flavor descriptions
  s390: Use proper string lengths when parsing opcode table flags

 opcodes/s390-mkopc.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

-- 
2.40.1

[PATCH 1/2] s390: Whitespace fixes in conditional branch flavor descriptions

[Jens Remus]

opcodes/
	* s390-mkopc.c: Whitespace fixes in conditional branch flavor
	  descriptions.

Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Reviewed-by: Andreas Krebbel <krebbel@linux.ibm.com>
---
 opcodes/s390-mkopc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 3a4aae3639a..7c00dea2d7f 100644
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -150,8 +150,8 @@ struct s390_cond_ext_format
    the '*' tag.  */
 #define NUM_COND_EXTENSIONS 20
 const struct s390_cond_ext_format s390_cond_extensions[NUM_COND_EXTENSIONS] =
-{ { '1', "o", "on overflow / if ones"},		/* jump on overflow / if ones */
-  { '2', "h", "on A high"},			/* jump on A high */
+{ { '1', "o", "on overflow / if ones" },	/* jump on overflow / if ones */
+  { '2', "h", "on A high" },			/* jump on A high */
   { '2', "p", "on plus" },			/* jump on plus */
   { '3', "nle", "on not low or equal" },	/* jump on not low or equal */
   { '4', "l", "on A low" },			/* jump on A low */
@@ -162,7 +162,7 @@ const struct s390_cond_ext_format s390_cond_extensions[NUM_COND_EXTENSIONS] =
   { '7', "nz", "on not zero / if not zeros" },	/* jump on not zero / if not zeros */
   { '8', "e", "on A equal B" },			/* jump on A equal B */
   { '8', "z", "on zero / if zeros" },		/* jump on zero / if zeros */
-  { '9', "nlh", "on not low or high " },	/* jump on not low or high */
+  { '9', "nlh", "on not low or high" },		/* jump on not low or high */
   { 'a', "he", "on high or equal" },		/* jump on high or equal */
   { 'b', "nl", "on A not low" },		/* jump on A not low */
   { 'b', "nm", "on not minus / if not mixed" },	/* jump on not minus / if not mixed */
-- 
2.40.1

[PATCH 2/2] s390: Use proper string lengths when parsing opcode table flags

[Jens Remus]

opcodes/
	* s390-mkopc.c: Use proper string lengths when parsing opcode
	  table flags.

Fixes: c5306fed7d4 ("s390: Support for jump visualization in disassembly")
Signed-off-by: Jens Remus <jremus@linux.ibm.com>
Reviewed-by: Andreas Krebbel <krebbel@linux.ibm.com>
---
 opcodes/s390-mkopc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 7c00dea2d7f..1f5729a3db0 100644
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -491,15 +491,15 @@ main (void)
 		       && (str[2] == 0 || str[2] == ',')) {
 	      flag_bits |= S390_INSTR_FLAG_VX;
 	      str += 2;
-	    } else if (strncmp (str, "jump", 7) == 0
+	    } else if (strncmp (str, "jump", 4) == 0
 		&& (str[4] == 0 || str[4] == ',')) {
 	      flag_bits |= S390_INSTR_FLAGS_CLASS_JUMP;
 	      str += 4;
-	    } else if (strncmp (str, "condjump", 7) == 0
+	    } else if (strncmp (str, "condjump", 8) == 0
 		&& (str[8] == 0 || str[8] == ',')) {
 	      flag_bits |= S390_INSTR_FLAGS_CLASS_CONDJUMP;
 	      str += 8;
-	    } else if (strncmp (str, "jumpsr", 7) == 0
+	    } else if (strncmp (str, "jumpsr", 6) == 0
 		&& (str[6] == 0 || str[6] == ',')) {
 	      flag_bits |= S390_INSTR_FLAGS_CLASS_JUMPSR;
 	      str += 6;
-- 
2.40.1

Re: [PATCH 1/2] s390: Whitespace fixes in conditional branch flavor descriptions

[Andreas Krebbel]

On 1/18/24 14:09, Jens Remus wrote:
> opcodes/
> 	* s390-mkopc.c: Whitespace fixes in conditional branch flavor
> 	  descriptions.
> 
> Signed-off-by: Jens Remus <jremus@linux.ibm.com>
> Reviewed-by: Andreas Krebbel <krebbel@linux.ibm.com>

Ok. Thanks!

Andreas

Re: [PATCH 2/2] s390: Use proper string lengths when parsing opcode table flags

[Andreas Krebbel]

On 1/18/24 14:09, Jens Remus wrote:
> opcodes/
> 	* s390-mkopc.c: Use proper string lengths when parsing opcode
> 	  table flags.

Ok. Thanks!

Andreas