From patchwork Mon Apr 30 09:10:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 906610 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=208.118.235.17; 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 [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40ZKDN654Gz9rvt for ; Mon, 30 Apr 2018 19:36:20 +1000 (AEST) Received: from localhost ([::1]:58675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fD5EI-0002E9-PJ for incoming@patchwork.ozlabs.org; Mon, 30 Apr 2018 05:36:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fD4qa-0006rK-Uq for qemu-devel@nongnu.org; Mon, 30 Apr 2018 05:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fD4qU-0006gJ-S0 for qemu-devel@nongnu.org; Mon, 30 Apr 2018 05:11:48 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:52217) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fD4qJ-0006TG-7f; Mon, 30 Apr 2018 05:11:31 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lsh5t-1eFm2x12an-012HMT; Mon, 30 Apr 2018 11:11:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 30 Apr 2018 11:10:26 +0200 Message-Id: <20180430091037.13878-32-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180430091037.13878-1-laurent@vivier.eu> References: <20180430091037.13878-1-laurent@vivier.eu> X-Provags-ID: V03:K1:Osm/J66UIRE8xlQTivsbSHz9/qH1BiOBZSy4/qkQjuYoMPFW/Xb tyz7b6/X2yTvMITuRi5gtIHsccSFwWt1Q0vAz/QHO7ivIn28gzoGOT2to7/x/onwCaOXMt+ FHwUTVuAbKFCzO/AmkbzxCOsw1MthMxOdF/3x1iMRBuTiRFjdMQENLqdUSX6ltaF3seD4LV i5leF9t9IrlH3Z7hBtiFA== X-UI-Out-Filterresults: notjunk:1; V01:K0:a/t9Iq1U+qc=:t2R2oCg+C9Lxv5S50FomWx vH1jI08Gm6GDQszZDZBsTJiF0ErZxXDbF+0BpbpP9Y2rMKuqK5JSPa3FHq565/TaJ+aw775F6 MdJ4JxAM2D7agH/qaHob2IDe4Gw4voQZyCBDckvIo4jTfDdB5iWPCmmNbADpDX70CIvJ8ZxR2 Bx8IN/KUXX5x21km3IlG7mZyGSeUl7GFDuRdJJzodrSEL0Vl33VFBUb9N6s/ILG8kW0grvpVg duw3sHqIFWnyIJkvTtcUUXGqPrSXsJEoqaJwGp9MOT8Gx8cJSp/AKDPaGppwMUVhus1Ev374k DCsa9ZBiwRn0BRJ7K9tD5+4MmN7iJxc8COm44myPRW0vmXU/+lDU8uXQOkp/bVN/QY2Hs8h6u nmTD5cPSf9zOtcmMe9oFiY8ZSpsgVG+UgQKhTcVrlM46gRxEZtHxvcSzJdTNLLL+Bvrihfuvp DwC6zjW4dmM3gHVVdtnOO+g5D+P/7KGkYmrxGkyTcmRfmzdc9afpADfLilt0njy4OEH3KBA+F 1XONKldaRvrLK+C/sYSn3KLnSRm+OFZ7eizIA4VUTZNgIPVmk9W1yB2C/tcTJpdUPiAX8SgAM ZtXLhRM8PrJfR7PumG4CXBXi59ZWZynvREzf7iOnzTnYKKsPv4On+tKyWFUD14ARKGGVS5OiH XxzJDWEq6HI4v9iP+hBb41MISj8wGIF1KAfH2AGfChbo3+qHXoJ+VEs8istdViKIwo00= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 31/42] linux-user: move openrisc cpu loop to openrisc 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: qemu-s390x@nongnu.org, Riku Voipio , Laurent Vivier , Cornelia Huck Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No code change, only move code from main.c to openrisc/cpu_loop.c. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson Message-Id: <20180411185651.21351-10-laurent@vivier.eu> --- linux-user/main.c | 96 ------------------------------------------ linux-user/openrisc/cpu_loop.c | 89 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 96 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 88f807549f..af26a17c46 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -149,92 +149,6 @@ void fork_end(int child) } } -#ifdef TARGET_OPENRISC - -void cpu_loop(CPUOpenRISCState *env) -{ - CPUState *cs = CPU(openrisc_env_get_cpu(env)); - int trapnr; - abi_long ret; - target_siginfo_t info; - - for (;;) { - cpu_exec_start(cs); - trapnr = cpu_exec(cs); - cpu_exec_end(cs); - process_queued_cpu_work(cs); - - switch (trapnr) { - case EXCP_SYSCALL: - env->pc += 4; /* 0xc00; */ - ret = do_syscall(env, - cpu_get_gpr(env, 11), /* return value */ - cpu_get_gpr(env, 3), /* r3 - r7 are params */ - cpu_get_gpr(env, 4), - cpu_get_gpr(env, 5), - cpu_get_gpr(env, 6), - cpu_get_gpr(env, 7), - cpu_get_gpr(env, 8), 0, 0); - if (ret == -TARGET_ERESTARTSYS) { - env->pc -= 4; - } else if (ret != -TARGET_QEMU_ESIGRETURN) { - cpu_set_gpr(env, 11, ret); - } - break; - case EXCP_DPF: - case EXCP_IPF: - case EXCP_RANGE: - info.si_signo = TARGET_SIGSEGV; - info.si_errno = 0; - info.si_code = TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_ALIGN: - info.si_signo = TARGET_SIGBUS; - info.si_errno = 0; - info.si_code = TARGET_BUS_ADRALN; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_ILLEGAL: - info.si_signo = TARGET_SIGILL; - info.si_errno = 0; - info.si_code = TARGET_ILL_ILLOPC; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_FPE: - info.si_signo = TARGET_SIGFPE; - info.si_errno = 0; - info.si_code = 0; - info._sifields._sigfault._addr = env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_INTERRUPT: - /* We processed the pending cpu work above. */ - break; - case EXCP_DEBUG: - trapnr = gdb_handlesig(cs, TARGET_SIGTRAP); - if (trapnr) { - info.si_signo = trapnr; - 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: - g_assert_not_reached(); - } - process_pending_signals(env); - } -} - -#endif /* TARGET_OPENRISC */ - #ifdef TARGET_SH4 void cpu_loop(CPUSH4State *env) { @@ -2442,16 +2356,6 @@ int main(int argc, char **argv, char **envp) env->regs[31] = regs->r31; env->sregs[SR_PC] = regs->pc; } -#elif defined(TARGET_OPENRISC) - { - int i; - - for (i = 0; i < 32; i++) { - cpu_set_gpr(env, i, regs->gpr[i]); - } - env->pc = regs->pc; - cpu_set_sr(env, regs->sr); - } #elif defined(TARGET_RISCV) { env->pc = regs->sepc; diff --git a/linux-user/openrisc/cpu_loop.c b/linux-user/openrisc/cpu_loop.c index b7700a5561..6c6ea871e1 100644 --- a/linux-user/openrisc/cpu_loop.c +++ b/linux-user/openrisc/cpu_loop.c @@ -21,6 +21,95 @@ #include "qemu.h" #include "cpu_loop-common.h" +void cpu_loop(CPUOpenRISCState *env) +{ + CPUState *cs = CPU(openrisc_env_get_cpu(env)); + int trapnr; + abi_long ret; + target_siginfo_t info; + + for (;;) { + cpu_exec_start(cs); + trapnr = cpu_exec(cs); + cpu_exec_end(cs); + process_queued_cpu_work(cs); + + switch (trapnr) { + case EXCP_SYSCALL: + env->pc += 4; /* 0xc00; */ + ret = do_syscall(env, + cpu_get_gpr(env, 11), /* return value */ + cpu_get_gpr(env, 3), /* r3 - r7 are params */ + cpu_get_gpr(env, 4), + cpu_get_gpr(env, 5), + cpu_get_gpr(env, 6), + cpu_get_gpr(env, 7), + cpu_get_gpr(env, 8), 0, 0); + if (ret == -TARGET_ERESTARTSYS) { + env->pc -= 4; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + cpu_set_gpr(env, 11, ret); + } + break; + case EXCP_DPF: + case EXCP_IPF: + case EXCP_RANGE: + info.si_signo = TARGET_SIGSEGV; + info.si_errno = 0; + info.si_code = TARGET_SEGV_MAPERR; + info._sifields._sigfault._addr = env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_ALIGN: + info.si_signo = TARGET_SIGBUS; + info.si_errno = 0; + info.si_code = TARGET_BUS_ADRALN; + info._sifields._sigfault._addr = env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_ILLEGAL: + info.si_signo = TARGET_SIGILL; + info.si_errno = 0; + info.si_code = TARGET_ILL_ILLOPC; + info._sifields._sigfault._addr = env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_FPE: + info.si_signo = TARGET_SIGFPE; + info.si_errno = 0; + info.si_code = 0; + info._sifields._sigfault._addr = env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_INTERRUPT: + /* We processed the pending cpu work above. */ + break; + case EXCP_DEBUG: + trapnr = gdb_handlesig(cs, TARGET_SIGTRAP); + if (trapnr) { + info.si_signo = trapnr; + 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: + g_assert_not_reached(); + } + process_pending_signals(env); + } +} + void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { + int i; + + for (i = 0; i < 32; i++) { + cpu_set_gpr(env, i, regs->gpr[i]); + } + env->pc = regs->pc; + cpu_set_sr(env, regs->sr); }