From patchwork Wed Aug 12 16:28:53 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 31211 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 bilbo.ozlabs.org (Postfix) with ESMTPS id A574DB6EDE for ; Thu, 13 Aug 2009 02:47:14 +1000 (EST) Received: from localhost ([127.0.0.1]:45814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbGyj-0001to-P6 for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2009 12:47:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbGhU-0003uL-S8 for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:29:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbGhP-0003lm-KR for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:29:20 -0400 Received: from [199.232.76.173] (port=58858 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbGhP-0003lU-GB for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:29:15 -0400 Received: from mail-gx0-f220.google.com ([209.85.217.220]:57673) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbGhO-0003ly-UD for qemu-devel@nongnu.org; Wed, 12 Aug 2009 12:29:15 -0400 Received: by gxk20 with SMTP id 20so329440gxk.10 for ; Wed, 12 Aug 2009 09:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=KPFTb8yWH3Mvu6xgp6yNVs1jafOMFFbbu2ivk8pKuto=; b=hKPX0xMxcqM2KQwdhX2dEjpd5zDPN993wZ3KEBG7K9NRHNvd07C9TUtZ/3qGkwZ1OC N7mc+kUXGFjxahQUCtpAMrU9QVQ5KqNy2OZKmKR4GB7xw8eo/whqdurrQM4ds/rZf+3N NVO0eUcBb8ZtklBJL31YV7ojBSnGSLbtJVFkI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; b=tbMvAWZyC3Qmcc3GTpz06brsUcjhkDKTbUACtOd3UC88jgUI7PdSTRPKP4BlLz3O/R zDIL+2DdvzMD03ttRVzjUg0Cuj1x/5eSD/IikCfmmUmiPmSFXi/aqm/YywBL+WMJM/ej RUBrtIAyvbyisDYpeBosdVWTp9Ht9Y+2juljE= MIME-Version: 1.0 Received: by 10.91.188.8 with SMTP id q8mr156964agp.67.1250094553709; Wed, 12 Aug 2009 09:29:13 -0700 (PDT) From: Artyom Tarasenko Date: Wed, 12 Aug 2009 18:28:53 +0200 Message-ID: To: Blue Swirl X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: qemu-devel Subject: [Qemu-devel] [Patch] sparc32 remove an unnecessary cpu irq set 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 Signed-off-by: Artyom Tarasenko --- env->psret = (_tmp & PSR_ET)? 1 : 0; \ --- a/cpu-exec.c +++ b/cpu-exec.c @@ -485,9 +485,6 @@ int cpu_exec(CPUState *env1) env->exception_index = env->interrupt_index; do_interrupt(env); env->interrupt_index = 0; -#if !defined(CONFIG_USER_ONLY) - cpu_check_irqs(env); -#endif next_tb = 0; } } else if (interrupt_request & CPU_INTERRUPT_TIMER) { diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 2428bb2..b69ebf5 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -480,9 +480,11 @@ static inline int cpu_cwp_dec(CPUSPARCState *env1, int cwp) #if !defined (TARGET_SPARC64) #define PUT_PSR(env, val) do { int _tmp = val; \ + int _newpsrpil=(_tmp & PSR_PIL) >> 8; \ env->psr = _tmp & PSR_ICC; \ env->psref = (_tmp & PSR_EF)? 1 : 0; \ - env->psrpil = (_tmp & PSR_PIL) >> 8; \ + if((_newpsrpil>env->psrpil)&& ((env->pil_in&15)>_newpsrpil)) cpu_check_irqs(env); \ + env->psrpil = _newpsrpil; \ env->psrs = (_tmp & PSR_S)? 1 : 0; \ env->psrps = (_tmp & PSR_PS)? 1 : 0; \