From patchwork Fri May 27 13:00:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 9138333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 37CB66075C for ; Fri, 27 May 2016 13:14:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29B0025D91 for ; Fri, 27 May 2016 13:14:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EA0727E3D; Fri, 27 May 2016 13:14:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FSL_HELO_HOME, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8594325D91 for ; Fri, 27 May 2016 13:14:19 +0000 (UTC) Received: from localhost ([::1]:45753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6Hak-0003Sr-I1 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 27 May 2016 09:14:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6HNj-0007Mx-QU for qemu-devel@nongnu.org; Fri, 27 May 2016 09:00:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b6HNe-0001A3-By for qemu-devel@nongnu.org; Fri, 27 May 2016 09:00:50 -0400 Received: from mail-lb0-x236.google.com ([2a00:1450:4010:c04::236]:35809) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b6HNd-00019b-MJ for qemu-devel@nongnu.org; Fri, 27 May 2016 09:00:46 -0400 Received: by mail-lb0-x236.google.com with SMTP id ww9so31533764lbc.2 for ; Fri, 27 May 2016 06:00:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ImEFnpnU6XVKG3QO9/WNpqTgRNvp6qIeltUr47K5Ibs=; b=JRdzyZSnTB46NXwhQW6eiDSRRLpQpcQ4kMcxAzDKsGvCsPNTaVR56hT5F0obfYsEUF 3CPwO3i1utwSC5DCtTqwl0Q1USJ8/g0D+4+soIPeaKY6HfTAnIR4yZK6PgxzndVGOdyT 8s0gzlqv07qfwlZ7Ka1JFL9o1B5F+NTbi2knI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ImEFnpnU6XVKG3QO9/WNpqTgRNvp6qIeltUr47K5Ibs=; b=JM2kFOY3g1wkczAdpZyzxqiAzMncQQkqH9z6cfOvRXk/frakzTqDV7fFRISE5Y5MrK b5hLpig5n7PD43774VQ+ky7fxxziqacPH0h13KYoWm7Wwq8ZYevs7AGwc2Ig/ZtgZ/ME qiJ4VYhN+rOcyb81rt/hx5C4gGDb4LcSqrU9IRadVzu2aLCdI0eQwayGp95S747SKURy SlywArJLbMbKyXtykJrg1l3qQHQmXYMb9c71QWcibtFEIkQqY6bQlUBRGriQ5U6UkdNx v9gZx9c7mwGzWokHmptRG0fZv6dD5XqWLAcFRFr1iCcHrTN1tfC02M8gE/mt9WytaLpt VAQw== X-Gm-Message-State: ALyK8tK6tikPQNyMa8RJXT2VQ8+p3Rt0YwUapxFjOBhPhETLsAz0qsdlzdo5xsGx6hLR4JRx X-Received: by 10.112.63.136 with SMTP id g8mr4368889lbs.135.1464354044758; Fri, 27 May 2016 06:00:44 -0700 (PDT) Received: from beaming.home (91-157-168-132.elisa-laajakaista.fi. [91.157.168.132]) by smtp.gmail.com with ESMTPSA id n16sm2281066lfg.31.2016.05.27.06.00.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 May 2016 06:00:43 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 27 May 2016 16:00:01 +0300 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c04::236 Subject: [Qemu-devel] [PULL v2 10/38] linux-user: Support for restarting system calls for SPARC targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Timothy E Baldwin Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Timothy E Baldwin Update the SPARC main loop and sigreturn code: * on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn * set all guest CPU state within signal.c code on sigreturn * handle TARGET_QEMU_ESIGRETURN in the main loop as the indication that the main loop should not touch any guest CPU state Signed-off-by: Timothy Edward Baldwin Message-id: 1441497448-32489-9-git-send-email-T.E.Baldwin99@members.leeds.ac.uk [PMM: Commit message tweaks; drop TARGET_USE_ERESTARTSYS define] Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/main.c | 3 +++ linux-user/signal.c | 2 +- linux-user/sparc/target_signal.h | 1 + linux-user/sparc64/target_signal.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/linux-user/main.c b/linux-user/main.c index dfc098f..04a9b9b 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1376,6 +1376,9 @@ void cpu_loop (CPUSPARCState *env) env->regwptr[2], env->regwptr[3], env->regwptr[4], env->regwptr[5], 0, 0); + if (ret == -TARGET_ERESTARTSYS || ret == -TARGET_QEMU_ESIGRETURN) { + break; + } if ((abi_ulong)ret >= (abi_ulong)(-515)) { #if defined(TARGET_SPARC64) && !defined(TARGET_ABI32) env->xcc |= PSR_CARRY; diff --git a/linux-user/signal.c b/linux-user/signal.c index 14e58b0..e742347 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -2449,7 +2449,7 @@ long do_sigreturn(CPUSPARCState *env) goto segv_and_exit; } unlock_user_struct(sf, sf_addr, 0); - return env->regwptr[0]; + return -TARGET_QEMU_ESIGRETURN; segv_and_exit: unlock_user_struct(sf, sf_addr, 0); diff --git a/linux-user/sparc/target_signal.h b/linux-user/sparc/target_signal.h index c7de300..2df38c8 100644 --- a/linux-user/sparc/target_signal.h +++ b/linux-user/sparc/target_signal.h @@ -33,4 +33,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) return state->regwptr[UREG_FP]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/sparc64/target_signal.h b/linux-user/sparc64/target_signal.h index c7de300..2df38c8 100644 --- a/linux-user/sparc64/target_signal.h +++ b/linux-user/sparc64/target_signal.h @@ -33,4 +33,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUSPARCState *state) return state->regwptr[UREG_FP]; } + #endif /* TARGET_SIGNAL_H */