From patchwork Tue Feb 8 09:59:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Gingold X-Patchwork-Id: 82276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BAC5CB7101 for ; Tue, 8 Feb 2011 21:01:39 +1100 (EST) Received: from localhost ([127.0.0.1]:52428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmkO8-0007pV-Fq for incoming@patchwork.ozlabs.org; Tue, 08 Feb 2011 05:01:36 -0500 Received: from [140.186.70.92] (port=42309 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmkMY-0007oE-8Y for qemu-devel@nongnu.org; Tue, 08 Feb 2011 04:59:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmkMR-0004u2-Sc for qemu-devel@nongnu.org; Tue, 08 Feb 2011 04:59:58 -0500 Received: from mel.act-europe.fr ([194.98.77.210]:48206) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmkMR-0004to-Im for qemu-devel@nongnu.org; Tue, 08 Feb 2011 04:59:51 -0500 Received: from localhost (localhost [127.0.0.1]) by filtered-smtp.eu.adacore.com (Postfix) with ESMTP id 706A8CB02B1 for ; Tue, 8 Feb 2011 10:59:50 +0100 (CET) X-Virus-Scanned: amavisd-new at eu.adacore.com Received: from mel.act-europe.fr ([127.0.0.1]) by localhost (smtp.eu.adacore.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6V5ejxi2tJm2 for ; Tue, 8 Feb 2011 10:59:50 +0100 (CET) Received: from ulanbator.act-europe.fr (ulanbator.act-europe.fr [10.10.1.67]) by mel.act-europe.fr (Postfix) with ESMTP id 56325CB021F for ; Tue, 8 Feb 2011 10:59:50 +0100 (CET) Received: by ulanbator.act-europe.fr (Postfix, from userid 501) id 4DD76BBFDE2; Tue, 8 Feb 2011 10:59:50 +0100 (CET) From: Tristan Gingold To: qemu-devel@nongnu.org Date: Tue, 8 Feb 2011 10:59:50 +0100 Message-Id: <1297159190-29092-1-git-send-email-gingold@adacore.com> X-Mailer: git-send-email 1.7.3.GIT X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 194.98.77.210 Subject: [Qemu-devel] [PATCH] Handle icount for powerpc tbl/tbu/decr load and store. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Handle option '-icount X' on powerpc targets. Signed-off-by: Tristan Gingold --- target-ppc/translate_init.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 907535e..7ef86ad 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -154,12 +154,24 @@ static void spr_read_ureg (void *opaque, int gprn, int sprn) #if !defined(CONFIG_USER_ONLY) static void spr_read_decr (void *opaque, int gprn, int sprn) { + if (use_icount) + gen_io_start(); gen_helper_load_decr(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_write_decr (void *opaque, int sprn, int gprn) { + if (use_icount) + gen_io_start(); gen_helper_store_decr(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } #endif @@ -167,12 +179,24 @@ static void spr_write_decr (void *opaque, int sprn, int gprn) /* Time base */ static void spr_read_tbl (void *opaque, int gprn, int sprn) { + if (use_icount) + gen_io_start(); gen_helper_load_tbl(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_read_tbu (void *opaque, int gprn, int sprn) { + if (use_icount) + gen_io_start(); gen_helper_load_tbu(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } __attribute__ (( unused )) @@ -190,12 +214,24 @@ static void spr_read_atbu (void *opaque, int gprn, int sprn) #if !defined(CONFIG_USER_ONLY) static void spr_write_tbl (void *opaque, int sprn, int gprn) { + if (use_icount) + gen_io_start(); gen_helper_store_tbl(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } static void spr_write_tbu (void *opaque, int sprn, int gprn) { + if (use_icount) + gen_io_start(); gen_helper_store_tbu(cpu_gpr[gprn]); + if (use_icount) { + gen_io_end(); + gen_stop_exception(opaque); + } } __attribute__ (( unused ))