Message ID | 20181019010625.25294-45-cota@braap.org |
---|---|
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=none (p=none dis=none) header.from=braap.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="tvQNd4T8"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="tdg9aMGt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bpdX4yMyz9s8J for <incoming@patchwork.ozlabs.org>; Fri, 19 Oct 2018 12:45:19 +1100 (AEDT) Received: from localhost ([::1]:46110 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 1gDJql-0005AG-7B for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 21:45:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59300) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFo-0004su-7u for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFk-0003Mh-HE for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:03 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:50421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFj-00034p-SC for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:00 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id AC7522293D; Thu, 18 Oct 2018 21:06:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 18 Oct 2018 21:06:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=/7HAzdz9V4gHw39uts8g3aczM4dLh44/OZeuh3DTdbo=; b=tvQNd 4T8EE7QDnezHaYc/9xET9KvRYw1xVDtm0+kKEDEskIsv0S3KVgMlhiAptDcC82Is 0PdplV0xz87FZZzpwgEVxnn+P8CWnqRx3krPCYXQ4/gKe9NMWOwjivDkAn6IyH4p ZE1Oj5MUfgKRhCNp4RK+us2eMyneBKkKdzWKig= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=/7HAzdz9V4gHw39uts8g3aczM4dLh 44/OZeuh3DTdbo=; b=tdg9aMGt62Hbi2vyeqljpyMgjotAbqyA480ErjL/ESIam KWanwmUNfMpf+uLGgVzCGkHGMvn4OFLW272n3GuFGxRxz1t/tXawIPdHkOZ1ec7D 2RKTuMMyNLGpZ16GFfRHmVAJnJEQcikJz8PfFD2EnPhIVYn4axWArWHZ49+qgeYX VopN1LrWTk46tggQQJssemzQNTmQUfu3gRpXycUMBzDlOffnKqVqhfkicNoc737m bf6EA/+3sYmN3Sfv2lJVEqeB3oVgBK1SacbAGVYYUb0Bt4ix/39wGCAxUDbe9wIo qJFjz7D7cj+v3VOFjaRVbKar7dl+E1DDg0X75O1mA== X-ME-Sender: <xms:HC7JW1fuo5jLdT8gEMT9kIZ7Q5NJ_k507okAJofotInT8E0uCllTUQ> X-ME-Proxy: <xmx:HC7JW7KBxWLrb3-DFRGM1NTuiU0RTLz1s_KXe5nc5KkJl7UVZeYhPA> <xmx:HC7JW1FGpunUtarZeE9hBmjfHDgJ4vwHe9rgdv1e3x7iKSEndi_eVw> <xmx:HC7JWw1WElVHUctdot2M17OfLG1In9oKmS3m2w7X7T-VFjdCoj5X3w> <xmx:HC7JW1JcBOVNhQ839J02qZ54U3T0SyMGqcAa0oyOiYy_i_Yr1yLmrQ> <xmx:HC7JW91GD7Nm9OEDeaRNfrYakAZEVoFI70qJIpiVdpFptYvEe7o-RQ> <xmx:HC7JW0mlqKt0sdthoJGBdQReTKclpbUEOYLX7UOd08xSM3tJh6eJ8Q> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 5CF65102E9; Thu, 18 Oct 2018 21:06:36 -0400 (EDT) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 21:06:13 -0400 Message-Id: <20181019010625.25294-45-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181019010625.25294-1-cota@braap.org> References: <20181019010625.25294-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.29 Subject: [Qemu-devel] [RFC v3 44/56] unicore32: convert to cpu_interrupt_request 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: Paolo Bonzini <pbonzini@redhat.com>, Guan Xuetao <gxt@mprc.pku.edu.cn> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
per-CPU locks
|
expand
|
On 10/19/18 2:06 AM, Emilio G. Cota wrote: > Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> > Signed-off-by: Emilio G. Cota <cota@braap.org> > --- > target/unicore32/cpu.c | 2 +- > target/unicore32/softmmu.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c index 2b49d1ca40..65c5334551 100644 --- a/target/unicore32/cpu.c +++ b/target/unicore32/cpu.c @@ -29,7 +29,7 @@ static void uc32_cpu_set_pc(CPUState *cs, vaddr value) static bool uc32_cpu_has_work(CPUState *cs) { - return cs->interrupt_request & + return cpu_interrupt_request(cs) & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); } diff --git a/target/unicore32/softmmu.c b/target/unicore32/softmmu.c index 00c7e0d028..f58e2361e0 100644 --- a/target/unicore32/softmmu.c +++ b/target/unicore32/softmmu.c @@ -119,7 +119,7 @@ void uc32_cpu_do_interrupt(CPUState *cs) /* The PC already points to the proper instruction. */ env->regs[30] = env->regs[31]; env->regs[31] = addr; - cs->interrupt_request |= CPU_INTERRUPT_EXITTB; + cpu_interrupt_request_or(cs, CPU_INTERRUPT_EXITTB); } static int get_phys_addr_ucv2(CPUUniCore32State *env, uint32_t address,
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn> Signed-off-by: Emilio G. Cota <cota@braap.org> --- target/unicore32/cpu.c | 2 +- target/unicore32/softmmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)