From patchwork Thu Apr 28 20:51:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 93328 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 0495C1007D7 for ; Fri, 29 Apr 2011 07:02:37 +1000 (EST) Received: from localhost ([::1]:44045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYM6-0008M4-96 for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 17:02:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBf-0005RT-2z for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFYBe-0005eC-16 for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:47 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:41062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBd-0005Yq-OF for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:45 -0400 Received: by mail-pw0-f45.google.com with SMTP id 6so1870069pwi.4 for ; Thu, 28 Apr 2011 13:51:45 -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=EdKX7ahVtCa30mh5bFXSb9kv2T2Db07ROx+WrYTeHXpnPGleTv2ryM7799cZQh8LMO 64m9A24bsXaAw62P04UfZL6SB1VzYAV9a2X7KxHtAodB3dq6QIht0Gv1dOOt732U7eix enARKoOEpU1CNtj1pvijkO+ddm5a/kltxkk/w= 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=pSMbR82kyxwozL80QK4qSjCHI9KgZIgLcyt1NfP3aYf6FS5WTG7J5Tk7wnoxO9YUIH ndbbKHcw/OgxSu4xSGlonVfXoK7UZKibC+OQO3darz4Gio+YQA8JTIOFTmarCN9ieQ8S zkERTChGP1CkZcZZwo+HK4OPfFxJDniJIjwvY= Received: by 10.143.33.7 with SMTP id l7mr1306648wfj.228.1304023905326; Thu, 28 Apr 2011 13:51:45 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id z10sm2266797wfj.12.2011.04.28.13.51.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 13:51:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2011 13:51:01 -0700 Message-Id: <1304023875-25040-20-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304023875-25040-1-git-send-email-rth@twiddle.net> References: <1304023875-25040-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.160.45 Subject: [Qemu-devel] [PATCH 19/33] 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 {