From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lg1tP-0003a7-63 for qemu-devel@nongnu.org; Sat, 07 Mar 2009 14:09:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lg1tL-0003YE-R4 for qemu-devel@nongnu.org; Sat, 07 Mar 2009 14:09:00 -0500 Received: from [199.232.76.173] (port=57964 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lg1tL-0003Y2-Ly for qemu-devel@nongnu.org; Sat, 07 Mar 2009 14:08:59 -0500 Received: from cantor2.suse.de ([195.135.220.15]:51031 helo=mx2.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lg1tL-0002od-7m for qemu-devel@nongnu.org; Sat, 07 Mar 2009 14:08:59 -0500 From: Alexander Graf Date: Sat, 7 Mar 2009 20:08:47 +0100 Message-Id: <1236452932-31622-7-git-send-email-agraf@suse.de> In-Reply-To: <1236452932-31622-6-git-send-email-agraf@suse.de> References: <1236452932-31622-1-git-send-email-agraf@suse.de> <1236452932-31622-2-git-send-email-agraf@suse.de> <1236452932-31622-3-git-send-email-agraf@suse.de> <1236452932-31622-4-git-send-email-agraf@suse.de> <1236452932-31622-5-git-send-email-agraf@suse.de> <1236452932-31622-6-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 06/11] PPC64: Enable 64bit mode on interrupts Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Alexander Graf Real 970s enable MSR_SF on all interrupts. The current code didn't do this until now, so let's activate it! Signed-off-by: Alexander Graf --- target-ppc/helper.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 5f3199e..60a63b8 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2612,7 +2612,7 @@ static always_inline void powerpc_excp (CPUState *env, new_msr |= (target_ulong)1 << MSR_CM; } } else { - if (!msr_isf) { + if (!msr_isf && !(env->mmu_model & POWERPC_MMU_64)) { new_msr &= ~((target_ulong)1 << MSR_SF); vector = (uint32_t)vector; } else { @@ -2793,6 +2793,10 @@ void cpu_ppc_reset (void *opaque) ppc_tlb_invalidate_all(env); #endif env->msr = msr & env->msr_mask; +#if defined(TARGET_PPC64) + if (env->mmu_model & POWERPC_MMU_64) + env->msr |= (1ULL << MSR_SF); +#endif hreg_compute_hflags(env); env->reserve = (target_ulong)-1ULL; /* Be sure no exception or interrupt is pending */ -- 1.6.0.2