From patchwork Mon May 9 21:34:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 94870 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2BE48B6F17 for ; Tue, 10 May 2011 07:40:08 +1000 (EST) Received: from localhost ([::1]:59184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJYBR-0003Dr-8M for incoming@patchwork.ozlabs.org; Mon, 09 May 2011 17:40:05 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6j-0003eV-T4 for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJY6j-0006LD-6M for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:13 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:38418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6i-0006Af-VP for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:13 -0400 Received: by mail-iw0-f173.google.com with SMTP id 42so5560360iwl.4 for ; Mon, 09 May 2011 14:35:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=L4RvprcZi/4ucvgTqiDwz3enV1L0D191dSZw3phXXPA=; b=QHl0qEkHzAQLRziOQbwPs9vSYiGc76oMrPjM4HrpxsBwHVs/lQB1rnqx6zryhsQNcX 9LZ+Id+ewro6XXq9kZeNncbpuHIa0a3pxugv1gEjjuN2xG7M06kvGbgDAQGF/YeWDRp6 mrEQIYJv3aev7hmwsUeFrAzBP9Hw6LQs9Tjr8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=dlVFDqDYwFQNK7BM2r00Ko1BZmcZQtB+bB/bxcOn2ESBbCVeZ4QJAyiaKk3vqAuFKG 3gk7iaGRDZYGjq9/+MBi991OpS+puYSjtMuc2+8Dzk+L20uIkAb9Zj3lcYQpOyRTbz6o z+xP0MdJFF1cBLPhQGz4ivSKlKslH593hgz+c= Received: by 10.42.222.72 with SMTP id if8mr994358icb.390.1304976912739; Mon, 09 May 2011 14:35:12 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id ui7sm2549819icb.14.2011.05.09.14.35.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 14:35:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 May 2011 14:34:32 -0700 Message-Id: <1304976889-29675-19-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304976889-29675-1-git-send-email-rth@twiddle.net> References: <1304976889-29675-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.173 Subject: [Qemu-devel] [PATCH 18/35] target-alpha: Use kernel mmu_idx for pal_mode. 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: Richard Henderson --- target-alpha/cpu.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 50a8109..88281bb 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -357,7 +357,13 @@ enum { static inline int cpu_mmu_index (CPUState *env) { - return (env->ps & PS_USER_MODE) != 0; + if (env->pal_mode) { + return MMU_KERNEL_IDX; + } else if (env->ps & PS_USER_MODE) { + return MMU_USER_IDX; + } else { + return MMU_KERNEL_IDX; + } } enum {