From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20071004112829.773479156@de.ibm.com> References: <20071004112706.574737175@de.ibm.com> Date: Thu, 04 Oct 2007 13:27:25 +0200 From: Martin Schwidefsky Subject: [patch 19/34] disassembler: fix output for insns with 6 operands. Content-Disposition: inline; filename=019-dis-bug.diff Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Martin Schwidefsky List-ID: From: Martin Schwidefsky 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 --- arch/s390/kernel/dis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: quilt-2.6/arch/s390/kernel/dis.c =================================================================== --- quilt-2.6.orig/arch/s390/kernel/dis.c +++ quilt-2.6/arch/s390/kernel/dis.c @@ -1162,6 +1162,7 @@ static int print_insn(char *buffer, unsi 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, unsi 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) -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.