From patchwork Wed Jul 4 00:47:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 168878 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 2F52A2C007A for ; Wed, 4 Jul 2012 12:36:25 +1000 (EST) Received: from localhost ([::1]:49883 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmFS3-00037c-2x for incoming@patchwork.ozlabs.org; Tue, 03 Jul 2012 22:36:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmDkh-0006b5-Ju for qemu-devel@nongnu.org; Tue, 03 Jul 2012 20:47:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SmDkf-0002x4-NW for qemu-devel@nongnu.org; Tue, 03 Jul 2012 20:47:31 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:65508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SmDkf-0002ww-Dt for qemu-devel@nongnu.org; Tue, 03 Jul 2012 20:47:29 -0400 Received: by pbbro12 with SMTP id ro12so11185670pbb.4 for ; Tue, 03 Jul 2012 17:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=22qHEen9RjgltERDrhRSnMb5r3O1Yf8r2sPyvVlN1u0=; b=HsncXSGS5Q+YyL/E+osMjVDrAt6aDG+3+prAbVhSOpPGje0se1HrCHF6Wn/oaE7/5A cbM8Yeg80ILAPPhk/FMA6rBk/Y+D4TM9d7YW026GKsc6VhWdXNoyGxOAUjmm/cvU6RWX 6P4paI5yuc6jHkBQYy5s0Vr0rO6WDV9fXD8GR1YVoH+nFeOTm64u8SLcArjzign05Lq/ PbmVbcYVLcHgh1EKHEXmcJl9Znfb/59Xl4gBThBAJIRtXm2BCJU7KEgUPScDBrnZvsn3 3uBI9ChoatwlwMLEft6If5fL4wEhQ7Lk+5UvOXqANa0SKxN1V9ZQ1Kw6tGPQ64mWVf8D gPcA== Received: by 10.68.241.227 with SMTP id wl3mr1343343pbc.89.1341362846737; Tue, 03 Jul 2012 17:47:26 -0700 (PDT) Received: from localhost ([220.248.0.154]) by mx.google.com with ESMTPS id of4sm16538702pbb.51.2012.07.03.17.47.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 17:47:25 -0700 (PDT) From: Wanpeng Li To: qemu-devel@nongnu.org Date: Wed, 4 Jul 2012 08:47:01 +0800 Message-Id: <1341362821-10386-1-git-send-email-liwp.linux@gmail.com> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 X-Mailman-Approved-At: Tue, 03 Jul 2012 22:36:09 -0400 Cc: Anthony Liguori , Wanpeng Li , Blue Swirl , Stefan Weil , Aurelien Jarno , Richard Henderson Subject: [Qemu-devel] [PATCH] fix qemu compile error with --enable-debug 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 From: Wanpeng Li CC i386-softmmu/target-i386/translate.o /home/kernel/qemu/target-i386/translate.c: In function ‘gen_sse’: /home/kernel/qemu/target-i386/translate.c:3571:27: error: assignment from incompatible pointer type [-Werror] /home/kernel/qemu/target-i386/translate.c:3573:17: error: incompatible type for argument 2 of ‘sse_fn_pl’ /home/kernel/qemu/target-i386/translate.c:3573:17: note: expected ‘TCGv_i64’ but argument is of type ‘TCGv_i32’ /home/kernel/qemu/target-i386/translate.c:3633:28: error: assignment from incompatible pointer type [-Werror] /home/kernel/qemu/target-i386/translate.c:3636:17: error: incompatible type for argument 1 of ‘sse_fn_l_p’ /home/kernel/qemu/target-i386/translate.c:3636:17: note: expected ‘TCGv_i64’ but argument is of type ‘TCGv_i32’ cc1: all warnings being treated as errors make[1]: *** [target-i386/translate.o] Error 1 make: *** [subdir-i386-softmmu] Error 2 Signed-off-by: Wanpeng Li --- target-i386/translate.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index a902f4a..ab1d0ff 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -3098,9 +3098,7 @@ static void gen_sse(DisasContext *s, int b, target_ulong pc_start, int rex_r) int b1, op1_offset, op2_offset, is_xmm, val, ot; int modrm, mod, rm, reg, reg_addr, offset_addr; SSEFunc_i_p sse_fn_i_p; - SSEFunc_l_p sse_fn_l_p; SSEFunc_0_pi sse_fn_pi; - SSEFunc_0_pl sse_fn_pl; SSEFunc_0_pp sse_fn_pp; SSEFunc_0_ppi sse_fn_ppi; SSEFunc_0_ppt sse_fn_ppt; @@ -3568,9 +3566,9 @@ static void gen_sse(DisasContext *s, int b, target_ulong pc_start, int rex_r) tcg_gen_trunc_tl_i32(cpu_tmp2_i32, cpu_T[0]); sse_fn_pi(cpu_ptr0, cpu_tmp2_i32); } else { - sse_fn_pl = sse_op_table3a[(s->dflag == 2) * 2 + + sse_fn_pi = sse_op_table3a[(s->dflag == 2) * 2 + ((b >> 8) - 2)]; - sse_fn_pl(cpu_ptr0, cpu_T[0]); + sse_fn_pi(cpu_ptr0, cpu_T[0]); } break; case 0x02c: /* cvttps2pi */ @@ -3630,10 +3628,10 @@ static void gen_sse(DisasContext *s, int b, target_ulong pc_start, int rex_r) sse_fn_i_p(cpu_tmp2_i32, cpu_ptr0); tcg_gen_extu_i32_tl(cpu_T[0], cpu_tmp2_i32); } else { - sse_fn_l_p = sse_op_table3b[(s->dflag == 2) * 2 + + sse_fn_i_p = sse_op_table3b[(s->dflag == 2) * 2 + ((b >> 8) - 2) + (b & 1) * 4]; - sse_fn_l_p(cpu_T[0], cpu_ptr0); + sse_fn_i_p(cpu_T[0], cpu_ptr0); } gen_op_mov_reg_T0(ot, reg); break;