From patchwork Fri Apr 24 19:27:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 464380 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C38FA1402D1 for ; Sat, 25 Apr 2015 05:27:41 +1000 (AEST) Received: from localhost ([::1]:46161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljGE-0001DN-Qc for incoming@patchwork.ozlabs.org; Fri, 24 Apr 2015 15:27:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljFr-0000fA-Ar for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:27:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YljFo-0006BA-1s for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:27:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YljFn-0006B4-Th for qemu-devel@nongnu.org; Fri, 24 Apr 2015 15:27:11 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 70709A10A8; Fri, 24 Apr 2015 19:27:11 +0000 (UTC) Received: from localhost (ovpn-113-180.phx2.redhat.com [10.3.113.180]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3OJRAWh015835; Fri, 24 Apr 2015 15:27:10 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 24 Apr 2015 16:27:04 -0300 Message-Id: <1429903624-6734-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , Richard Henderson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paolo Bonzini Subject: [Qemu-devel] [PATCH] target-i386: Use X86CPU in disas_insn() 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: Eduardo Habkost --- target-i386/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target-i386/translate.c b/target-i386/translate.c index 305ce50..fdbb4af 100644 --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -4402,9 +4402,10 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b, /* convert one instruction. s->is_jmp is set if the translation must be stopped. Return the next pc value */ -static target_ulong disas_insn(CPUX86State *env, DisasContext *s, +static target_ulong disas_insn(X86CPU *cpu, DisasContext *s, target_ulong pc_start) { + CPUX86State *env = &cpu->env; int b, prefixes; int shift; TCGMemOp ot, aflag, dflag; @@ -8025,7 +8026,7 @@ static inline void gen_intermediate_code_internal(X86CPU *cpu, if (num_insns + 1 == max_insns && (tb->cflags & CF_LAST_IO)) gen_io_start(); - pc_ptr = disas_insn(env, dc, pc_ptr); + pc_ptr = disas_insn(cpu, dc, pc_ptr); num_insns++; /* stop translation if indicated */ if (dc->is_jmp)