Message ID | 20180529105011.1914-38-edgar.iglesias@gmail.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hGlgDS1O"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40wBH637MXz9s0W for <incoming@patchwork.ozlabs.org>; Tue, 29 May 2018 21:25:38 +1000 (AEST) Received: from localhost ([::1]:60290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fNcky-0001ol-3y for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 07:25:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <edgar.iglesias@gmail.com>) id 1fNcDk-00020c-C7 for qemu-devel@nongnu.org; Tue, 29 May 2018 06:51:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <edgar.iglesias@gmail.com>) id 1fNcDj-0004PU-Jw for qemu-devel@nongnu.org; Tue, 29 May 2018 06:51:16 -0400 Received: from mail-wr0-x233.google.com ([2a00:1450:400c:c0c::233]:36897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <edgar.iglesias@gmail.com>) id 1fNcDj-0004OP-D2 for qemu-devel@nongnu.org; Tue, 29 May 2018 06:51:15 -0400 Received: by mail-wr0-x233.google.com with SMTP id i12-v6so24714572wrc.4 for <qemu-devel@nongnu.org>; Tue, 29 May 2018 03:51:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pjJuGPh/sdSV/8JPrUjXBhqQA6Hwj/VEXz9PYM/PDa0=; b=hGlgDS1OTiqgKkrUlQLUXZW0/10c1+wZkHhGU9iCsHXqasl8+u2Xo/UMM2xlfZq9Dh 1iNjOu+X8bAC3Tg4o8HHoJTKjHrWD+xW6sZSPGX4uazFXwK5X57GQj2GhX8qxNfJq3Lx b5wfukmjxv4Q98Qyql+dbO6TlBOCWIEKgaLTsa/qncIwQXCamnB5BjDwoaTAACDg7J8s +breJNRZ1uP+hkxfcWbX2DCNFbfLzbH3k2Lx+4Dqb+KHy3ghRf6d4TzculNuhCzmprtb 7cuUbb3L2GMpQJAWYghrE0xhSX9j06s38gNMdglNDxBkVqemIalflda9cZNceK4TdM+w 76dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pjJuGPh/sdSV/8JPrUjXBhqQA6Hwj/VEXz9PYM/PDa0=; b=Vl7h/+z/vsltN5O2RkfNYqY5CO9L2BpmSzmG5/B/T80JxfpBJNp8k08l/gf43ewrMJ 2pouqSR4jqT6Ly5r4TLRLM03o44gXsGLU8WW42n/MjiyFPk87IZDW/FPs3znaUcupN26 4tRHypmF3kgafx1EvmspTSeGOH2w107XU47R6rMCBmOl6mWdd2lc8w57IfgZ5/paePRz 75S8eoxga0cEBth9tAr+ivtZ5Fu9oBsmXZ9WLsBe0VZ2UQEkvYFzIxeY8zXsvYDAfW4B 8I0yUN6yymKKlBd5Ctf/4HILm6hN/TdXTS9ysVXjHb8RQNCcGyHBYbRLGf4u2gR1UzxL oQfA== X-Gm-Message-State: ALKqPwd8C30Ndk7Rrn0UF0zADyO06Y9Hp/3Hpf7okM/SkTATRXIpipYo i3uh/D/1sI+gk6rKm21DX92jAQ== X-Google-Smtp-Source: ADUXVKLflT19nt4xVRa0mewO3W8dJmeRfCD+XIPvXcwq/P8xbkohePgYhWRXl32MEEtfwLK8i+IO4w== X-Received: by 2002:a19:1460:: with SMTP id k93-v6mr8945484lfi.23.1527591074044; Tue, 29 May 2018 03:51:14 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id y12-v6sm6398826lji.34.2018.05.29.03.51.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 May 2018 03:51:13 -0700 (PDT) From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com> To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 12:50:10 +0200 Message-Id: <20180529105011.1914-38-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180529105011.1914-1-edgar.iglesias@gmail.com> References: <20180529105011.1914-1-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::233 Subject: [Qemu-devel] [PULL v1 37/38] target-microblaze: cpu_mmu_index: Fixup indentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
Xilinx queue
|
expand
|
diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index e38580cd7f..c77ca2d8f9 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -360,13 +360,15 @@ int cpu_mb_signal_handler(int host_signum, void *pinfo, static inline int cpu_mmu_index (CPUMBState *env, bool ifetch) { - /* Are we in nommu mode?. */ - if (!(env->sregs[SR_MSR] & MSR_VM)) - return MMU_NOMMU_IDX; - - if (env->sregs[SR_MSR] & MSR_UM) - return MMU_USER_IDX; - return MMU_KERNEL_IDX; + /* Are we in nommu mode?. */ + if (!(env->sregs[SR_MSR] & MSR_VM)) { + return MMU_NOMMU_IDX; + } + + if (env->sregs[SR_MSR] & MSR_UM) { + return MMU_USER_IDX; + } + return MMU_KERNEL_IDX; } int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw,