From patchwork Mon Mar 26 19:15:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 891178 Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 4093v00n5fz9s1j for ; Tue, 27 Mar 2018 06:22:34 +1100 (AEDT) Received: from localhost ([::1]:58673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0XhP-00083F-GZ for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2018 15:22:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0Xby-0003TP-QD for qemu-devel@nongnu.org; Mon, 26 Mar 2018 15:16:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0Xbx-0001hA-HB for qemu-devel@nongnu.org; Mon, 26 Mar 2018 15:16:54 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:53033) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0Xbx-0001gm-7R; Mon, 26 Mar 2018 15:16:53 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LfcCc-1eCgrj2wWY-00pLTf; Mon, 26 Mar 2018 21:16:34 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 26 Mar 2018 21:15:55 +0200 Message-Id: <20180326191603.10217-12-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180326191603.10217-1-laurent@vivier.eu> References: <20180326191603.10217-1-laurent@vivier.eu> X-Provags-ID: V03:K0:m/S6NORjmjDvTV28y6dFeqrwry5YprNKAA2zb35tKdTIP6ND3SL ftt/1HZnTNNcIZDc2cvVWMEW+ZzwESBWzwZWwmsoYflUtnC6ku8rN7L118VEXTpTBbsMi36 XI2sOiiQrffds3U9822bxL5Iw3p/Xh26O/ZPIHADfKlE6sJ1p60JWhr7nZyKQxSviecXIjy S28eCZjug2L3hJkM/oOrA== X-UI-Out-Filterresults: notjunk:1; V01:K0:/CNchzKJx6s=:4vgClGB8dB2giyyQ9ARkJA SsJUJ4S8RjV1r9Q1CWY3v8CIiqZgi4rIFNw7fngmhrL5ZQiqkwDcpBP8q0Z9UFlz/IqzPaI7t beY1Wn3/C3ZuZ8iLj+W4pW7Nit7OsLvczUDcwX744g7ut+kJ7Loq9xOonQbknghp8SMFYIcRO R/Y0Qtvy5OJVchc7p2PPCZe3hzPemTqmSxG06IlRydT2QUsRXQsnCT1Wwi9BvT5kWn10ptB6w 9wMNpWuayoGbcyJdqCLwVKjdj3eURQ41B6Ks0NS7XEAxgJuF3wksrEN1kC7RgG/cObwwV9xq1 A3a0z2WYO2f5XVPVqSYPK18DWV6N4nWwFAxtRlBAlTAVUncfHBdz6/pKj/tBm/IrPl+U62FcU Xi9xq+W+6necRATBqrJRPI0EOvqgrkljQhJN4xDAG2DnsiAEiCdzFIA1vMQEFmZJUq+eoaBvN pGlUz476EdztVSQ9KbUspW3STa3cdZDcUPoFn34oFyi092eGzMztAe/hUgAHW0wnen2f3mpNg 245q11vZdnPaCepXroMSiuSnQvgMQcHQR/bK9bG+1Sq3i9K7HxhyQBueVtDfuzOvfBm2K8Rf/ /RYtyQvTEbGM1Uta5cqbENlQtFMOI99G0Q5vN+Z5T3VKa3vc2a+LUZgh46bJfVec4krxkr+5K BW9P1YRV82dpmxSj6fHAg36Ysh+JBSMyUqxEUOeKIJVxTTQ1taE/JzfJ16p0M/hcVXYRZEzCH iyDaLmPNfmXYr7WVkUYMY6b/4yQEYiGAcXM+OQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH for 2.13 11/19] linux-user: move cris cpu loop to cris directory 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: Peter Maydell , Riku Voipio , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Laurent Vivier , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No code change, only move code from main.c to cris/cpu_loop.c. Signed-off-by: Laurent Vivier --- linux-user/cris/cpu_loop.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ linux-user/main.c | 90 ---------------------------------------------- 2 files changed, 89 insertions(+), 90 deletions(-) diff --git a/linux-user/cris/cpu_loop.c b/linux-user/cris/cpu_loop.c index b7700a5561..96406e5c97 100644 --- a/linux-user/cris/cpu_loop.c +++ b/linux-user/cris/cpu_loop.c @@ -21,6 +21,95 @@ #include "qemu.h" #include "cpu_loop-common.h" +void cpu_loop(CPUCRISState *env) +{ + CPUState *cs = CPU(cris_env_get_cpu(env)); + int trapnr, ret; + target_siginfo_t info; + + while (1) { + cpu_exec_start(cs); + trapnr = cpu_exec(cs); + cpu_exec_end(cs); + process_queued_cpu_work(cs); + + switch (trapnr) { + case 0xaa: + { + info.si_signo = TARGET_SIGSEGV; + info.si_errno = 0; + /* XXX: check env->error_code */ + info.si_code = TARGET_SEGV_MAPERR; + info._sifields._sigfault._addr = env->pregs[PR_EDA]; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + } + break; + case EXCP_INTERRUPT: + /* just indicate that signals should be handled asap */ + break; + case EXCP_BREAK: + ret = do_syscall(env, + env->regs[9], + env->regs[10], + env->regs[11], + env->regs[12], + env->regs[13], + env->pregs[7], + env->pregs[11], + 0, 0); + if (ret == -TARGET_ERESTARTSYS) { + env->pc -= 2; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[10] = ret; + } + break; + case EXCP_DEBUG: + { + int sig; + + sig = gdb_handlesig(cs, TARGET_SIGTRAP); + if (sig) + { + info.si_signo = sig; + info.si_errno = 0; + info.si_code = TARGET_TRAP_BRKPT; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + } + } + break; + case EXCP_ATOMIC: + cpu_exec_step_atomic(cs); + break; + default: + printf ("Unhandled trap: 0x%x\n", trapnr); + cpu_dump_state(cs, stderr, fprintf, 0); + exit(EXIT_FAILURE); + } + process_pending_signals (env); + } +} + void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { + CPUState *cpu = ENV_GET_CPU(env); + TaskState *ts = cpu->opaque; + struct image_info *info = ts->info; + + env->regs[0] = regs->r0; + env->regs[1] = regs->r1; + env->regs[2] = regs->r2; + env->regs[3] = regs->r3; + env->regs[4] = regs->r4; + env->regs[5] = regs->r5; + env->regs[6] = regs->r6; + env->regs[7] = regs->r7; + env->regs[8] = regs->r8; + env->regs[9] = regs->r9; + env->regs[10] = regs->r10; + env->regs[11] = regs->r11; + env->regs[12] = regs->r12; + env->regs[13] = regs->r13; + env->regs[14] = info->start_stack; + env->regs[15] = regs->acr; + env->pc = regs->erp; } diff --git a/linux-user/main.c b/linux-user/main.c index 211148858e..560e4a5b6a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -149,76 +149,6 @@ void fork_end(int child) } } -#ifdef TARGET_CRIS -void cpu_loop(CPUCRISState *env) -{ - CPUState *cs = CPU(cris_env_get_cpu(env)); - int trapnr, ret; - target_siginfo_t info; - - while (1) { - cpu_exec_start(cs); - trapnr = cpu_exec(cs); - cpu_exec_end(cs); - process_queued_cpu_work(cs); - - switch (trapnr) { - case 0xaa: - { - info.si_signo = TARGET_SIGSEGV; - info.si_errno = 0; - /* XXX: check env->error_code */ - info.si_code = TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr = env->pregs[PR_EDA]; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - break; - case EXCP_INTERRUPT: - /* just indicate that signals should be handled asap */ - break; - case EXCP_BREAK: - ret = do_syscall(env, - env->regs[9], - env->regs[10], - env->regs[11], - env->regs[12], - env->regs[13], - env->pregs[7], - env->pregs[11], - 0, 0); - if (ret == -TARGET_ERESTARTSYS) { - env->pc -= 2; - } else if (ret != -TARGET_QEMU_ESIGRETURN) { - env->regs[10] = ret; - } - break; - case EXCP_DEBUG: - { - int sig; - - sig = gdb_handlesig(cs, TARGET_SIGTRAP); - if (sig) - { - info.si_signo = sig; - info.si_errno = 0; - info.si_code = TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - } - break; - case EXCP_ATOMIC: - cpu_exec_step_atomic(cs); - break; - default: - printf ("Unhandled trap: 0x%x\n", trapnr); - cpu_dump_state(cs, stderr, fprintf, 0); - exit(EXIT_FAILURE); - } - process_pending_signals (env); - } -} -#endif - #ifdef TARGET_MICROBLAZE void cpu_loop(CPUMBState *env) { @@ -2287,26 +2217,6 @@ int main(int argc, char **argv, char **envp) env->ir[IR_SP] = regs->usp; env->pc = regs->pc; } -#elif defined(TARGET_CRIS) - { - env->regs[0] = regs->r0; - env->regs[1] = regs->r1; - env->regs[2] = regs->r2; - env->regs[3] = regs->r3; - env->regs[4] = regs->r4; - env->regs[5] = regs->r5; - env->regs[6] = regs->r6; - env->regs[7] = regs->r7; - env->regs[8] = regs->r8; - env->regs[9] = regs->r9; - env->regs[10] = regs->r10; - env->regs[11] = regs->r11; - env->regs[12] = regs->r12; - env->regs[13] = regs->r13; - env->regs[14] = info->start_stack; - env->regs[15] = regs->acr; - env->pc = regs->erp; - } #elif defined(TARGET_S390X) { int i;