From patchwork Thu Sep 27 22:39:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187549 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 972B12C00B6 for ; Fri, 28 Sep 2012 09:33:17 +1000 (EST) Received: from localhost ([::1]:38867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlN-0004O7-9o for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 18:40:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMks-00039e-Kr for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THMko-00033H-Tb for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:24 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:45883) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMko-00031Y-Nw for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:22 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so4262166pbb.4 for ; Thu, 27 Sep 2012 15:40:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=sjGQyILJ1HXf5nR3JYpdq+dfrF1reusLxfSyiJuw9ro=; b=wBm8tmIjvUhOHwY8WBPcBJscGqEusyhnnEwZXaN7gevL60GkWe2xU8iyDdmvh4ja61 MvcxDL88+ejETLJdskWPxmuaM3iTx77GOa8a+MuxslE3PlAiPzztVry66+chNSehISHk Pgi+/M+uVrA0Tw0mpVE9ATuuZGmiOiDawrrPMxxItIVq7IZfOa4BzlP4Y8Uy+C/zBVsH rP/yo3hmyaJF4e5cYKDvlmj3nQR3/WvA7sDDgtt+Up5gacG4LaG8iaybG30qmA/27ePa UDTFZ2ABaVcTY8Bn5TLB3ZUgUr/v1HBSs+ATTszmuhyehz4c1P7pkG7QqjJvuzcNUrtr sHzw== Received: by 10.68.224.133 with SMTP id rc5mr15122163pbc.130.1348785622369; Thu, 27 Sep 2012 15:40:22 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id sj5sm4480267pbc.30.2012.09.27.15.40.21 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 15:40:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 15:39:45 -0700 Message-Id: <1348785610-23418-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 004/147] target-s390: Fix disassembly of cpsdr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Richard Henderson --- s390-dis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/s390-dis.c b/s390-dis.c index bbdd239..3759164 100644 --- a/s390-dis.c +++ b/s390-dis.c @@ -673,7 +673,9 @@ static const struct s390_operand s390_operands[] = This is just a workaround for existing code e.g. glibc. */ #define INSTR_RRE_RR_OPT 4, { R_24,RO_28,0,0,0,0 } /* efpc, sfpc */ #define INSTR_RRF_F0FF 4, { F_16,F_24,F_28,0,0,0 } /* e.g. madbr */ -#define INSTR_RRF_F0FF2 4, { F_24,F_16,F_28,0,0,0 } /* e.g. cpsdr */ +/* QEMU-MOD */ +#define INSTR_RRF_F0FF2 4, { F_24,F_28,F_16,0,0,0 } /* e.g. cpsdr */ +/* QEMU-END */ #define INSTR_RRF_F0FR 4, { F_24,F_16,R_28,0,0,0 } /* e.g. iedtr */ #define INSTR_RRF_FUFF 4, { F_24,F_16,F_28,U4_20,0,0 } /* e.g. didbr */ #define INSTR_RRF_RURR 4, { R_24,R_28,R_16,U4_20,0,0 } /* e.g. .insn */