From patchwork Thu Aug 20 21:47:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 509179 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 1B55E1402A2 for ; Fri, 21 Aug 2015 07:47:01 +1000 (AEST) Received: from localhost ([::1]:37310 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSXfm-00013R-UD for incoming@patchwork.ozlabs.org; Thu, 20 Aug 2015 17:46:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSXfD-0000dC-Ji for qemu-devel@nongnu.org; Thu, 20 Aug 2015 17:46:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSXf8-00089i-Ij for qemu-devel@nongnu.org; Thu, 20 Aug 2015 17:46:23 -0400 Received: from blu004-omc1s22.hotmail.com ([65.55.116.33]:52626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSXf8-00089e-Fu for qemu-devel@nongnu.org; Thu, 20 Aug 2015 17:46:18 -0400 Received: from BLU436-SMTP65 ([65.55.116.8]) by BLU004-OMC1S22.hotmail.com over TLS secured channel with Microsoft SMTPSVC(7.5.7601.23008); Thu, 20 Aug 2015 14:46:18 -0700 X-TMN: [NNeiNsJOKvwH28Tb72IjRhD8YH/82Tmv] X-Originating-Email: [xili_gchen_5257@hotmail.com] Message-ID: Date: Fri, 21 Aug 2015 05:47:59 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Peter Maydell , "rth@twiddle.net" , Chris Metcalf , =?windows-1252?Q?Andreas_F=E4rber?= , "walt@tilera.com" , Riku Voipio References: In-Reply-To: X-OriginalArrivalTime: 20 Aug 2015 21:46:16.0344 (UTC) FILETIME=[A416C180:01D0DB91] X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 65.55.116.33 Cc: qemu-devel Subject: [Qemu-devel] [PATCH 15/16 v1] tilegx: Match with the latest qemu master tree 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 The interface of cpu_exec and cpu_exec_init are changed, so qemu tilegx should match with them. Signed-off-by: Chen Gang --- linux-user/main.c | 2 +- target-tilegx/cpu.c | 2 +- target-tilegx/cpu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index f0bda09..2d4b0b4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -3644,7 +3644,7 @@ void cpu_loop(CPUTLGState *env) while (1) { cpu_exec_start(cs); - trapnr = cpu_tilegx_exec(env); + trapnr = cpu_tilegx_exec(cs); cpu_exec_end(cs); switch (trapnr) { case TILEGX_EXCP_SYSCALL: diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c index 663fcb6..4793909 100644 --- a/target-tilegx/cpu.c +++ b/target-tilegx/cpu.c @@ -77,7 +77,7 @@ static void tilegx_cpu_initfn(Object *obj) static bool tcg_initialized; cs->env_ptr = env; - cpu_exec_init(env); + cpu_exec_init(cs, &error_abort); if (tcg_enabled() && !tcg_initialized) { tcg_initialized = true; diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h index 808f4e5..a7c812b 100644 --- a/target-tilegx/cpu.h +++ b/target-tilegx/cpu.h @@ -153,7 +153,7 @@ static inline TileGXCPU *tilegx_env_get_cpu(CPUTLGState *env) #include "exec/cpu-all.h" void tilegx_tcg_init(void); -int cpu_tilegx_exec(CPUTLGState *s); +int cpu_tilegx_exec(CPUState *s); int cpu_tilegx_signal_handler(int host_signum, void *pinfo, void *puc); TileGXCPU *cpu_tilegx_init(const char *cpu_model);