From nobody Mon Feb 9 14:50:30 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.zoho.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 1487021279866763.5605607256131; Mon, 13 Feb 2017 13:27:59 -0800 (PST) Received: from localhost ([::1]:59605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdOA9-0005uH-MU for importer@patchew.org; Mon, 13 Feb 2017 16:27:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdO8J-0004WZ-ES for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdO8I-0001DH-0C for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:03 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdO8H-0001D6-RM for qemu-devel@nongnu.org; Mon, 13 Feb 2017 16:26:01 -0500 Received: by mail-qt0-x243.google.com with SMTP id s58so15046626qtc.2 for ; Mon, 13 Feb 2017 13:26:01 -0800 (PST) Received: from bigtime.twiddle.net.com ([1.129.9.91]) by smtp.gmail.com with ESMTPSA id h40sm8311480qtb.6.2017.02.13.13.25.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Feb 2017 13:26:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1nUSRuFph6ucvYzI3hQu0wFAp7zEv8bB99RIqY+nI50=; b=cJvlQaEzPqxmQUObdXH7BKzkYbmENj8KgAG/KVAKVIXneDFhN6vJJ5ChgP18i9S1Lj tGZJ4M4qEVSxQ2Keraxndoe9aV9D0ynJapMGU8ikuC4IJEb1yeRiCNbXVa4VOxxAVdJ3 u/+I/+Pi+cQBV/jKB7yxrBHYnriQF6I2Q1Twt2/6JpQyrEvUp76Tr29EggSvpOa3lSsR l0Mn3PmVD2Tgl/rAB6d7tBeIECny72bzlrO3UKpRiif93z2uSyvGmUdKoPofDLSl8h2J N3UymjNbZGUu43uQqewoOBtuu5ljae3ZUQEy7ryrmR9hOlZqIPnxsPA8fWtMG7fF0W/w APDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1nUSRuFph6ucvYzI3hQu0wFAp7zEv8bB99RIqY+nI50=; b=sVpmDhWpQQTcWQGr9bKnPZfTiWuZfq73NDnLzPGn4kPTkhyaH20kkmCrVy43DWCiWL V0ahKy77H5CalG7C1NXgQV2mVrYQmya+ubrJsuvSX3ffKkm/Zuy5jMPugKDAOLxDTGab 1QbIN8yu2wEVS8i6iMBgu0Eth+rclf9/y4/h28vnfFGFHLItzZtgpmcAM6B6Rc4DPE+B R5oNRwrD1h+9cC3LSXdXt2/m84h7dF2nJZjjtrTYZ/DHirFQYjaijct75X9zUwdFLXWX yK9VAbttCooeWC0k1JvIO9hnB5Q946BXtdOhk8koKXLaBXTQhvY9mQh+lrNBl3Bv2Vb7 w/ng== X-Gm-Message-State: AMke39m5NTIMEq7HYrYzFsgnKCxs8C0VhNqgML3FFJbINs7J4dYvb1Kxxv0LbRL/MO7GwQ== X-Received: by 10.237.60.122 with SMTP id u55mr22681578qte.41.1487021161175; Mon, 13 Feb 2017 13:26:01 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Feb 2017 08:25:15 +1100 Message-Id: <20170213212536.31871-4-rth@twiddle.net> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170213212536.31871-1-rth@twiddle.net> References: <20170213212536.31871-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PULL 03/24] linux-user: Fix openrisc cpu_loop 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@linaro.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" We need to handle EXCP_DEBUG and EXCP_INTERRUPT. We need to send signals to the guest using queue_signal. Signed-off-by: Richard Henderson --- linux-user/main.c | 95 ++++++++++++++++++++++++---------------------------= ---- 1 file changed, 41 insertions(+), 54 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index e588f58..001f71c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2574,52 +2574,17 @@ kuser_fail: void cpu_loop(CPUOpenRISCState *env) { CPUState *cs =3D CPU(openrisc_env_get_cpu(env)); - int trapnr, gdbsig; + int trapnr; abi_long ret; + target_siginfo_t info; =20 for (;;) { cpu_exec_start(cs); trapnr =3D cpu_exec(cs); cpu_exec_end(cs); process_queued_cpu_work(cs); - gdbsig =3D 0; =20 switch (trapnr) { - case EXCP_RESET: - qemu_log_mask(CPU_LOG_INT, "\nReset request, exit, pc is %#x\n= ", env->pc); - exit(EXIT_FAILURE); - break; - case EXCP_BUSERR: - qemu_log_mask(CPU_LOG_INT, "\nBus error, exit, pc is %#x\n", e= nv->pc); - gdbsig =3D TARGET_SIGBUS; - break; - case EXCP_DPF: - case EXCP_IPF: - cpu_dump_state(cs, stderr, fprintf, 0); - gdbsig =3D TARGET_SIGSEGV; - break; - case EXCP_TICK: - qemu_log_mask(CPU_LOG_INT, "\nTick time interrupt pc is %#x\n"= , env->pc); - break; - case EXCP_ALIGN: - qemu_log_mask(CPU_LOG_INT, "\nAlignment pc is %#x\n", env->pc); - gdbsig =3D TARGET_SIGBUS; - break; - case EXCP_ILLEGAL: - qemu_log_mask(CPU_LOG_INT, "\nIllegal instructionpc is %#x\n",= env->pc); - gdbsig =3D TARGET_SIGILL; - break; - case EXCP_INT: - qemu_log_mask(CPU_LOG_INT, "\nExternal interruptpc is %#x\n", = env->pc); - break; - case EXCP_DTLBMISS: - case EXCP_ITLBMISS: - qemu_log_mask(CPU_LOG_INT, "\nTLB miss\n"); - break; - case EXCP_RANGE: - qemu_log_mask(CPU_LOG_INT, "\nRange\n"); - gdbsig =3D TARGET_SIGSEGV; - break; case EXCP_SYSCALL: env->pc +=3D 4; /* 0xc00; */ ret =3D do_syscall(env, @@ -2636,32 +2601,54 @@ void cpu_loop(CPUOpenRISCState *env) env->gpr[11] =3D ret; } break; + case EXCP_DPF: + case EXCP_IPF: + case EXCP_RANGE: + info.si_signo =3D TARGET_SIGSEGV; + info.si_errno =3D 0; + info.si_code =3D TARGET_SEGV_MAPERR; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_ALIGN: + info.si_signo =3D TARGET_SIGBUS; + info.si_errno =3D 0; + info.si_code =3D TARGET_BUS_ADRALN; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; + case EXCP_ILLEGAL: + info.si_signo =3D TARGET_SIGILL; + info.si_errno =3D 0; + info.si_code =3D TARGET_ILL_ILLOPC; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); + break; case EXCP_FPE: - qemu_log_mask(CPU_LOG_INT, "\nFloating point error\n"); + info.si_signo =3D TARGET_SIGFPE; + info.si_errno =3D 0; + info.si_code =3D 0; + info._sifields._sigfault._addr =3D env->pc; + queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info); break; - case EXCP_TRAP: - qemu_log_mask(CPU_LOG_INT, "\nTrap\n"); - gdbsig =3D TARGET_SIGTRAP; + case EXCP_INTERRUPT: + /* We processed the pending cpu work above. */ break; - case EXCP_NR: - qemu_log_mask(CPU_LOG_INT, "\nNR\n"); + case EXCP_DEBUG: + trapnr =3D gdb_handlesig(cs, TARGET_SIGTRAP); + if (trapnr) { + info.si_signo =3D trapnr; + 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, "\nqemu: unhandled CPU exception %#x - aborting= \n", - trapnr); - gdbsig =3D TARGET_SIGILL; - break; - } - if (gdbsig) { - gdb_handlesig(cs, gdbsig); - if (gdbsig !=3D TARGET_SIGTRAP) { - exit(EXIT_FAILURE); - } + g_assert_not_reached(); } - process_pending_signals(env); } } --=20 2.9.3