From patchwork Wed May 25 10:31:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 9135095 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 EA5BE607D7 for ; Wed, 25 May 2016 10:33:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E103D282BE for ; Wed, 25 May 2016 10:33:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5F5C282D8; Wed, 25 May 2016 10:33:32 +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 C750C282BE for ; Wed, 25 May 2016 10:33:31 +0000 (UTC) Received: from localhost ([::1]:58803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W82-0001c3-Ua for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 May 2016 06:33:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W6y-00012r-2U for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5W6o-00033k-H5 for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:23 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:34580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W6n-00032j-Fq for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:14 -0400 Received: by mail-lf0-x22e.google.com with SMTP id k98so16327865lfi.1 for ; Wed, 25 May 2016 03:32:13 -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=FC9o43qFyRkCn1c0Q/eRM5yrozr4zafaZXkiU+KNbIc=; b=QQxwLxnaA8dRzNoUF2NfjKA5PbsSs1pimjZfn/Cg+/eIJsR056AxXD9Cw/S6/di+p9 +ZX90a5CtB1DXf96nTgODxxC2Df+O1mwwENxtElrOQvfF/gvLHZRQQZxR1OZzkeheLXX /bXZhXWEUHMr0GH4I4S6DkuZzkXwo0AVRN55I= 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=FC9o43qFyRkCn1c0Q/eRM5yrozr4zafaZXkiU+KNbIc=; b=AhG6cKTg8WrHFL01cbyrQN5JqizAx7Ho3CBT+nt27iBCRuLZOcTfcNcFJBLetKfVSy tSMTUUwkJNXCla3PWhzFDVGYZ4SI06XIvFjSRDFoBLtS92byd249+8gGMWayFFKS+G6s kBlYxPBAUY9uUWZQ4D+0ajCVe1HAq0hFKiraXXNLdGoTKPm89al78clv5peJs/sUguA9 cKcCz7NHzh8jHQGQzLwG/rvfVTM8jnFidv6LETYaH1wnMvnkOO9tCMo1Vz/545l7g/sm s98lLzaBwilJ675g7ixpysRp5TaF7LBsWlbOU+yS+aeipoEC+0Aeh6YoXoSwqh4dKsTd 0aPA== X-Gm-Message-State: ALyK8tJiBkKJ2hKhdgIi8mBMngcQGIsckrp3K7cuORFmdhprGwD8t0jaVQ8gza6C6wQ6RsRR X-Received: by 10.25.146.6 with SMTP id u6mr742964lfd.60.1464172332284; Wed, 25 May 2016 03:32:12 -0700 (PDT) Received: from beaming.home (91-157-168-132.elisa-laajakaista.fi. [91.157.168.132]) by smtp.gmail.com with ESMTPSA id o75sm1379610lfi.9.2016.05.25.03.32.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 03:32:11 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Wed, 25 May 2016 13:31:40 +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:c07::22e Subject: [Qemu-devel] [PULL 08/38] linux-user: Support for restarting system calls for MIPS 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 MIPS main loop code: * on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn (We already handle TARGET_QEMU_ESIGRETURN.) Signed-off-by: Timothy Edward Baldwin Message-id: 1441497448-32489-7-git-send-email-T.E.Baldwin99@members.leeds.ac.uk Reviewed-by: Peter Maydell [PMM: tweak commit message; drop TARGET_USE_ERESTARTSYS define] Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/main.c | 4 ++++ linux-user/mips/target_signal.h | 1 + linux-user/mips64/target_signal.h | 1 + 3 files changed, 6 insertions(+) diff --git a/linux-user/main.c b/linux-user/main.c index 0e3da58..3b47045 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2528,6 +2528,10 @@ done_syscall: env->active_tc.gpr[8], env->active_tc.gpr[9], env->active_tc.gpr[10], env->active_tc.gpr[11]); # endif /* O32 */ + if (ret == -TARGET_ERESTARTSYS) { + env->active_tc.PC -= 4; + break; + } if (ret == -TARGET_QEMU_ESIGRETURN) { /* Returning from a successful sigreturn syscall. Avoid clobbering register state. */ diff --git a/linux-user/mips/target_signal.h b/linux-user/mips/target_signal.h index 6e1dc8b..460cc9f 100644 --- a/linux-user/mips/target_signal.h +++ b/linux-user/mips/target_signal.h @@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state) return state->active_tc.gpr[29]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/mips64/target_signal.h b/linux-user/mips64/target_signal.h index 5fb6a2c..a2dc514 100644 --- a/linux-user/mips64/target_signal.h +++ b/linux-user/mips64/target_signal.h @@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMIPSState *state) return state->active_tc.gpr[29]; } + #endif /* TARGET_SIGNAL_H */