summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2007-10-12 16:11:33 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2007-10-12 16:13:06 +0200
commit74ccbdc226cac44bb56cd479917195dc5132d7aa (patch)
tree5a50a228260612599fd452c24261c1d064a41c20
parent076fc808ab804c6cfb40fd0caa0b74dd50e0d5de (diff)
downloadlinux-stable-74ccbdc226cac44bb56cd479917195dc5132d7aa.tar.gz
linux-stable-74ccbdc226cac44bb56cd479917195dc5132d7aa.tar.bz2
linux-stable-74ccbdc226cac44bb56cd479917195dc5132d7aa.zip
[S390] disassembler: fix output for insns with 6 operands.
The termination condition of the loop that prints the operands of an instruction doesn't stop after the maximum of 6 operands. It continues with the operands of the next instruction format instead which create really long lines. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/dis.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 50d2235df732..5f315affc81e 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1162,6 +1162,7 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
unsigned int value;
char separator;
char *ptr;
+ int i;
ptr = buffer;
insn = find_insn(code);
@@ -1169,7 +1170,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
ptr += sprintf(ptr, "%.5s\t", insn->name);
/* Extract the operands. */
separator = 0;
- for (ops = formats[insn->format] + 1; *ops != 0; ops++) {
+ for (ops = formats[insn->format] + 1, i = 0;
+ *ops != 0 && i < 6; ops++, i++) {
operand = operands + *ops;
value = extract_operand(code, operand);
if ((operand->flags & OPERAND_INDEX) && value == 0)