From patchwork Sat Sep 5 23:57:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Baldwin X-Patchwork-Id: 514866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 B0FCA14056B for ; Sun, 6 Sep 2015 10:01:27 +1000 (AEST) Received: from localhost ([::1]:43552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYNOf-0008GB-Kr for incoming@patchwork.ozlabs.org; Sat, 05 Sep 2015 20:01:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYNLk-000379-9G for qemu-devel@nongnu.org; Sat, 05 Sep 2015 19:58:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYNLh-0005wq-Q2 for qemu-devel@nongnu.org; Sat, 05 Sep 2015 19:58:24 -0400 Received: from avasout06.plus.net ([212.159.14.18]:39193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYNLh-0005sa-KY for qemu-devel@nongnu.org; Sat, 05 Sep 2015 19:58:21 -0400 Received: from bfg ([87.114.133.92]) by avasout06 with smtp id DbyL1r0081zmLPr01byMfP; Sun, 06 Sep 2015 00:58:21 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=E4sw3vpl c=1 sm=1 tr=0 a=wMIFfKY+zwUDgD4aAwecrg==:117 a=wMIFfKY+zwUDgD4aAwecrg==:17 a=0Bzu9jTXAAAA:8 a=FJhpQO9QAAAA:8 a=h_6DSLV0AAAA:8 a=ff-B7xzCdYMA:10 a=L1MF7qefqHKTH7siqu8A:9 Received: from tim by bfg with local (Exim 4.84) (envelope-from ) id 1ZYNLf-00005V-O4; Sun, 06 Sep 2015 00:58:19 +0100 From: Timothy E Baldwin To: qemu-devel@nongnu.org Date: Sun, 6 Sep 2015 00:57:24 +0100 Message-Id: <1441497448-32489-31-git-send-email-T.E.Baldwin99@members.leeds.ac.uk> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441497448-32489-1-git-send-email-T.E.Baldwin99@members.leeds.ac.uk> References: <1441497448-32489-1-git-send-email-T.E.Baldwin99@members.leeds.ac.uk> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 212.159.14.18 Cc: riku.voipio@iki.fi, Timothy E Baldwin Subject: [Qemu-devel] [PATCH 30/34] linux-user: Support for restarting system calls for OpenRISC targets 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: Timothy Edward Baldwin Reviewed-by: Peter Maydell --- WARNING - NOT TESTED linux-user/main.c | 22 ++++++++++++++-------- linux-user/openrisc/syscall.h | 2 ++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 9ca1c99..b052e17 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2687,6 +2687,7 @@ void cpu_loop(CPUOpenRISCState *env) { CPUState *cs = CPU(openrisc_env_get_cpu(env)); int trapnr, gdbsig; + abi_long ret; for (;;) { cpu_exec_start(cs); @@ -2732,14 +2733,19 @@ void cpu_loop(CPUOpenRISCState *env) break; case EXCP_SYSCALL: env->pc += 4; /* 0xc00; */ - env->gpr[11] = do_syscall(env, - env->gpr[11], /* return value */ - env->gpr[3], /* r3 - r7 are params */ - env->gpr[4], - env->gpr[5], - env->gpr[6], - env->gpr[7], - env->gpr[8], 0, 0); + ret = do_syscall(env, + env->gpr[11], /* return value */ + env->gpr[3], /* r3 - r7 are params */ + env->gpr[4], + env->gpr[5], + env->gpr[6], + env->gpr[7], + env->gpr[8], 0, 0); + if (ret == -TARGET_ERESTARTSYS) { + env->pc -= 4; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->gpr[11] = ret; + } break; case EXCP_FPE: qemu_log("\nFloating point error\n"); diff --git a/linux-user/openrisc/syscall.h b/linux-user/openrisc/syscall.h index 8ac0365..74787ed 100644 --- a/linux-user/openrisc/syscall.h +++ b/linux-user/openrisc/syscall.h @@ -27,3 +27,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#define TARGET_USE_ERESTARTSYS 1