diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-10-12 10:11:33 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-10-12 10:13:06 -0400 |
commit | 74ccbdc226cac44bb56cd479917195dc5132d7aa (patch) | |
tree | 5a50a228260612599fd452c24261c1d064a41c20 /arch/s390 | |
parent | 076fc808ab804c6cfb40fd0caa0b74dd50e0d5de (diff) |
[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>
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/dis.c | 4 |
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) | |||
1162 | unsigned int value; | 1162 | unsigned int value; |
1163 | char separator; | 1163 | char separator; |
1164 | char *ptr; | 1164 | char *ptr; |
1165 | int i; | ||
1165 | 1166 | ||
1166 | ptr = buffer; | 1167 | ptr = buffer; |
1167 | insn = find_insn(code); | 1168 | insn = find_insn(code); |
@@ -1169,7 +1170,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr) | |||
1169 | ptr += sprintf(ptr, "%.5s\t", insn->name); | 1170 | ptr += sprintf(ptr, "%.5s\t", insn->name); |
1170 | /* Extract the operands. */ | 1171 | /* Extract the operands. */ |
1171 | separator = 0; | 1172 | separator = 0; |
1172 | for (ops = formats[insn->format] + 1; *ops != 0; ops++) { | 1173 | for (ops = formats[insn->format] + 1, i = 0; |
1174 | *ops != 0 && i < 6; ops++, i++) { | ||
1173 | operand = operands + *ops; | 1175 | operand = operands + *ops; |
1174 | value = extract_operand(code, operand); | 1176 | value = extract_operand(code, operand); |
1175 | if ((operand->flags & OPERAND_INDEX) && value == 0) | 1177 | if ((operand->flags & OPERAND_INDEX) && value == 0) |