From nobody Tue Feb 10 19:49:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1523475208370892.8677490960816; Wed, 11 Apr 2018 12:33:28 -0700 (PDT) Received: from localhost ([::1]:49678 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6LUl-0003Ua-Cw for importer@patchew.org; Wed, 11 Apr 2018 15:33:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f6KwF-0006EP-20 for qemu-devel@nongnu.org; Wed, 11 Apr 2018 14:57:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f6KwA-0007zb-P7 for qemu-devel@nongnu.org; Wed, 11 Apr 2018 14:57:47 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:43849) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f6Kw3-0007rK-7E; Wed, 11 Apr 2018 14:57:35 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LiUtY-1eTyJ13qBg-00cit2; Wed, 11 Apr 2018 20:57:20 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2018 20:56:45 +0200 Message-Id: <20180411185651.21351-14-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180411185651.21351-1-laurent@vivier.eu> References: <20180411185651.21351-1-laurent@vivier.eu> X-Provags-ID: V03:K1:1Ci0RsOKdmQGaA+TkXvZPdpz0aBhjUcVRby7ewdTKWgq9pSHUVB w0Mex0kM2nnlVlN8xmMwzG5R20NaEvVpL7VFSJ7x7i8Zvtmpt0ZhdY2nbEHuP9jprRhQ1gk Ua6lUAbCFgn5T5JQUm/vL6qV009sVTmap17tfQAyzXinjWsSF0OuWozlikLD82GM8DJBSzU I5dovIhwMxRq9S0rfgZlA== X-UI-Out-Filterresults: notjunk:1;V01:K0:f0uEtalXY8g=:AtSVhfof0A817jVZRbpnhJ eMsgLKWKG/ZyNN6Pka9tof4nyYmUYkczV0EEamkaKNCfvxcMMK+As1QkIWOBTm+LhmHZ+y/kA /YgI5pBH2WdA/C7yyfZbH4alYzyxkh3DsdAEi6w1Gy58lHNQwtxEUIDlKZaoQLctZ/u/jEFRY FFtxYKqzyxsX66nu4NI07E73C1MQ+hrFLA+jzAVY70zAF4I96qn5YJm22v7AOwzRtsuiKVGmk 4+HBs7X0fkra+GL2f6tR07QnOElxhtFhvH1tReZfn05L9rUAKp1Qt9UFnLW33XbimHopczxYG 1HEc75Sm7yOyNfSwo7rP75mn8WhwvuRm9Yxj8tymv7YiA5r2tRmrDhm43ZFzPVz9vNmXjOWgm 8eWNnUq3WKj49b+wJVImgpw5Co2SdrjVkjQZHxKtCE64N6pySy4cNRnptvLxgGoPKLA2zMEtC ehrf9oPWU0hWu2hW/o6fXjMBtOKlAdv0bjXXDWG4z+tTuI+mVEEDhRzxi1XwUEozE6dgVH6bA U/zizxqTdAARqiNAx/aYravMGsTkEB2cMv5qus2ueAFyk8FAI0ssRMAlYBmVYTCjQlgdLZyXb VhoPq2jMXliLAEM31QKg39T+8HagbLaiLA20gVu4LtDkMux8HeJUrV7lIuHcuOtykyBt2mv3o vdl74nnYoNVKyLn6tVA+mIb2IXSq3L5Sqe+18UGArMjv25hkwGeEUt4WRKuoyKz1kzPGBBm2M fKYHYCrMQXcShwks81iBToDnzTxXIJiqVOnK6A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PATCH for 2.13 v2 13/19] linux-user: move m68k cpu loop to m68k 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 , Cornelia Huck , Riku Voipio , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" No code change, only move code from main.c to m68k/cpu_loop.c. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- linux-user/m68k/cpu_loop.c | 144 +++++++++++++++++++++++++++++++++++++++++= ++ linux-user/main.c | 150 +----------------------------------------= ---- 2 files changed, 145 insertions(+), 149 deletions(-) diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index b7700a5561..b4d3d8af3d 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -21,6 +21,150 @@ #include "qemu.h" #include "cpu_loop-common.h" =20 +void cpu_loop(CPUM68KState *env) +{ + CPUState *cs =3D CPU(m68k_env_get_cpu(env)); + int trapnr; + unsigned int n; + target_siginfo_t info; + TaskState *ts =3D cs->opaque; + + for(;;) { + cpu_exec_start(cs); + trapnr =3D cpu_exec(cs); + cpu_exec_end(cs); + process_queued_cpu_work(cs); + + switch(trapnr) { + case EXCP_ILLEGAL: + { + if (ts->sim_syscalls) { + uint16_t nr; + get_user_u16(nr, env->pc + 2); + env->pc +=3D 4; + do_m68k_simcall(env, nr); + } else { + goto do_sigill; + } + } + break; + case EXCP_HALT_INSN: + /* Semihosing syscall. */ + env->pc +=3D 4; + do_m68k_semihosting(env, env->dregs[0]); + break; + case EXCP_LINEA: + case EXCP_LINEF: + case EXCP_UNSUPPORTED: + do_sigill: + info.si_signo =3D TARGET_SIGILL; + info.si_errno =3D 0; + info.si_code =3D TARGET_ILL_ILLOPN; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_CHK: + info.si_signo =3D TARGET_SIGFPE; + info.si_errno =3D 0; + info.si_code =3D TARGET_FPE_INTOVF; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_DIV0: + info.si_signo =3D TARGET_SIGFPE; + info.si_errno =3D 0; + info.si_code =3D TARGET_FPE_INTDIV; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_TRAP0: + { + abi_long ret; + ts->sim_syscalls =3D 0; + n =3D env->dregs[0]; + env->pc +=3D 2; + ret =3D do_syscall(env, + n, + env->dregs[1], + env->dregs[2], + env->dregs[3], + env->dregs[4], + env->dregs[5], + env->aregs[0], + 0, 0); + if (ret =3D=3D -TARGET_ERESTARTSYS) { + env->pc -=3D 2; + } else if (ret !=3D -TARGET_QEMU_ESIGRETURN) { + env->dregs[0] =3D ret; + } + } + break; + case EXCP_INTERRUPT: + /* just indicate that signals should be handled asap */ + break; + case EXCP_ACCESS: + { + info.si_signo =3D TARGET_SIGSEGV; + info.si_errno =3D 0; + /* XXX: check env->error_code */ + info.si_code =3D TARGET_SEGV_MAPERR; + info._sifields._sigfault._addr =3D env->mmu.ar; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + } + break; + case EXCP_DEBUG: + { + int sig; + + sig =3D gdb_handlesig(cs, TARGET_SIGTRAP); + if (sig) + { + info.si_signo =3D sig; + info.si_errno =3D 0; + info.si_code =3D TARGET_TRAP_BRKPT; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + } + } + break; + case EXCP_ATOMIC: + cpu_exec_step_atomic(cs); + break; + default: + EXCP_DUMP(env, "qemu: unhandled CPU exception 0x%x - aborting\= n", trapnr); + abort(); + } + process_pending_signals(env); + } +} + void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { + CPUState *cpu =3D ENV_GET_CPU(env); + TaskState *ts =3D cpu->opaque; + struct image_info *info =3D ts->info; + + env->pc =3D regs->pc; + env->dregs[0] =3D regs->d0; + env->dregs[1] =3D regs->d1; + env->dregs[2] =3D regs->d2; + env->dregs[3] =3D regs->d3; + env->dregs[4] =3D regs->d4; + env->dregs[5] =3D regs->d5; + env->dregs[6] =3D regs->d6; + env->dregs[7] =3D regs->d7; + env->aregs[0] =3D regs->a0; + env->aregs[1] =3D regs->a1; + env->aregs[2] =3D regs->a2; + env->aregs[3] =3D regs->a3; + env->aregs[4] =3D regs->a4; + env->aregs[5] =3D regs->a5; + env->aregs[6] =3D regs->a6; + env->aregs[7] =3D regs->usp; + env->sr =3D regs->sr; + + ts->sim_syscalls =3D 1; + ts->stack_base =3D info->start_stack; + ts->heap_base =3D info->brk; + /* This will be filled in on the first SYS_HEAPINFO call. */ + ts->heap_limit =3D 0; } diff --git a/linux-user/main.c b/linux-user/main.c index 9e49c8a30c..7c223a5629 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -149,125 +149,6 @@ void fork_end(int child) } } =20 -#ifdef TARGET_M68K - -void cpu_loop(CPUM68KState *env) -{ - CPUState *cs =3D CPU(m68k_env_get_cpu(env)); - int trapnr; - unsigned int n; - target_siginfo_t info; - TaskState *ts =3D cs->opaque; - - for(;;) { - cpu_exec_start(cs); - trapnr =3D cpu_exec(cs); - cpu_exec_end(cs); - process_queued_cpu_work(cs); - - switch(trapnr) { - case EXCP_ILLEGAL: - { - if (ts->sim_syscalls) { - uint16_t nr; - get_user_u16(nr, env->pc + 2); - env->pc +=3D 4; - do_m68k_simcall(env, nr); - } else { - goto do_sigill; - } - } - break; - case EXCP_HALT_INSN: - /* Semihosing syscall. */ - env->pc +=3D 4; - do_m68k_semihosting(env, env->dregs[0]); - break; - case EXCP_LINEA: - case EXCP_LINEF: - case EXCP_UNSUPPORTED: - do_sigill: - info.si_signo =3D TARGET_SIGILL; - info.si_errno =3D 0; - info.si_code =3D TARGET_ILL_ILLOPN; - info._sifields._sigfault._addr =3D env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_CHK: - info.si_signo =3D TARGET_SIGFPE; - info.si_errno =3D 0; - info.si_code =3D TARGET_FPE_INTOVF; - info._sifields._sigfault._addr =3D env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_DIV0: - info.si_signo =3D TARGET_SIGFPE; - info.si_errno =3D 0; - info.si_code =3D TARGET_FPE_INTDIV; - info._sifields._sigfault._addr =3D env->pc; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - break; - case EXCP_TRAP0: - { - abi_long ret; - ts->sim_syscalls =3D 0; - n =3D env->dregs[0]; - env->pc +=3D 2; - ret =3D do_syscall(env, - n, - env->dregs[1], - env->dregs[2], - env->dregs[3], - env->dregs[4], - env->dregs[5], - env->aregs[0], - 0, 0); - if (ret =3D=3D -TARGET_ERESTARTSYS) { - env->pc -=3D 2; - } else if (ret !=3D -TARGET_QEMU_ESIGRETURN) { - env->dregs[0] =3D ret; - } - } - break; - case EXCP_INTERRUPT: - /* just indicate that signals should be handled asap */ - break; - case EXCP_ACCESS: - { - info.si_signo =3D TARGET_SIGSEGV; - info.si_errno =3D 0; - /* XXX: check env->error_code */ - info.si_code =3D TARGET_SEGV_MAPERR; - info._sifields._sigfault._addr =3D env->mmu.ar; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - break; - case EXCP_DEBUG: - { - int sig; - - sig =3D gdb_handlesig(cs, TARGET_SIGTRAP); - if (sig) - { - info.si_signo =3D sig; - info.si_errno =3D 0; - info.si_code =3D TARGET_TRAP_BRKPT; - queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); - } - } - break; - case EXCP_ATOMIC: - cpu_exec_step_atomic(cs); - break; - default: - EXCP_DUMP(env, "qemu: unhandled CPU exception 0x%x - aborting\= n", trapnr); - abort(); - } - process_pending_signals(env); - } -} -#endif /* TARGET_M68K */ - #ifdef TARGET_ALPHA void cpu_loop(CPUAlphaState *env) { @@ -2028,29 +1909,7 @@ int main(int argc, char **argv, char **envp) =20 target_cpu_copy_regs(env, regs); =20 -#if defined(TARGET_M68K) - { - env->pc =3D regs->pc; - env->dregs[0] =3D regs->d0; - env->dregs[1] =3D regs->d1; - env->dregs[2] =3D regs->d2; - env->dregs[3] =3D regs->d3; - env->dregs[4] =3D regs->d4; - env->dregs[5] =3D regs->d5; - env->dregs[6] =3D regs->d6; - env->dregs[7] =3D regs->d7; - env->aregs[0] =3D regs->a0; - env->aregs[1] =3D regs->a1; - env->aregs[2] =3D regs->a2; - env->aregs[3] =3D regs->a3; - env->aregs[4] =3D regs->a4; - env->aregs[5] =3D regs->a5; - env->aregs[6] =3D regs->a6; - env->aregs[7] =3D regs->usp; - env->sr =3D regs->sr; - ts->sim_syscalls =3D 1; - } -#elif defined(TARGET_RISCV) +#if defined(TARGET_RISCV) { env->pc =3D regs->sepc; env->gpr[xSP] =3D regs->sp; @@ -2105,13 +1964,6 @@ int main(int argc, char **argv, char **envp) } #endif =20 -#if defined(TARGET_M68K) - ts->stack_base =3D info->start_stack; - ts->heap_base =3D info->brk; - /* This will be filled in on the first SYS_HEAPINFO call. */ - ts->heap_limit =3D 0; -#endif - if (gdbstub_port) { if (gdbserver_start(gdbstub_port) < 0) { fprintf(stderr, "qemu: could not open gdbserver on port %d\n", --=20 2.14.3