From nobody Mon Feb 07 11:58:47 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7D2D219C498E; Mon, 7 Feb 2022 11:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsl6H2wmZz3jqq; Mon, 7 Feb 2022 11:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644235127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Nx8i9veCrfLgBpchjmflhfJtDWQZckwJH0Sr41VrQ0=; b=ydOfXpi59ykdFB/ZUWq9OzFJMYW1OnkbRrp1w0Y2KOzUq+GpQ7Y2SfX+JMS8J6ENdtuceP EbTt3rzLKJuxq/IY3AGNsVYmmyDFnTbdY22lh7AQO4visB6w0npD67otyaFS5jPHO3GX0w 2UqcxPYqLmbVq1axlDHaoy2vVgl1FKiKLijP63B0Fo2htcLr53JR60rPsRnP5aADQCf0OP PerCO3+v9w7zg7UmMxmDtLGt7owLNFgHBdLkSFhS/InhPghUQmP7jbIxM7DEXT9uwnhzO9 2VCCK5RO1KzDsyeyev5vUzExRwAefhEusEDjTJfxbi9CcQeB/WSIVRtlhUFYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4101825076; Mon, 7 Feb 2022 11:58:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217BwlAn024293; Mon, 7 Feb 2022 11:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217BwlCL024292; Mon, 7 Feb 2022 11:58:47 GMT (envelope-from git) Date: Mon, 7 Feb 2022 11:58:47 GMT Message-Id: <202202071158.217BwlCL024292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 67dc576bae6e - main - Fix the signal code on 32-bit breakpoints on arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67dc576bae6e624ae46962ad187e0e31fece6688 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644235127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Nx8i9veCrfLgBpchjmflhfJtDWQZckwJH0Sr41VrQ0=; b=osRq+mr0WXJeAYGygNZdU/sXG72V0/OQjub81EaTaJTvhU/blCbdOLyoVRkfpr4pLNkaCf BIVEoOu8yUhHW6/4xD6s9DmXJ1K9Jf6FLjmTNNC8C6NNSNbbPAm7krB+bQ/Hk5fzAXumrA Zo4tFRwV0mZYZUfH8Jg7nuOkfEyQOcqZx/PlJGvlbGL4gSvaglUsGknTQCjQpiKz7pfw5A UNqG48Nvnbsh/HOOWav2PVct4mG3XXx81Va1+ESXT/Fg9IWJf095pO7cNmshTWT26T4j3q FZb5NBDF4YDTSrHs5iuLEadwEdZccL7SKssI2w3D71++JCUE0t1cwx3/KY7dMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644235127; a=rsa-sha256; cv=none; b=OIHHMyv+5bT5Rvuzq+C85lz177ZDSLHamFrc7VpY+I+pxzrp2eqlnLgEH1kJH2avp8JKSv X6Z7RuYoNfo0hcpxwAB3TRld3P+/qHVotkuMDm2f1wiH8Ahi5vsE3jCZN0UpL+cKrbF/MS GZ+fYNgYKG4CehCnykxIR5Kyv0OijB4yVVMk8uFasoGxZ3bTjRkBnh9EGtpv04aqa5poNG T51CMC0533a3udEcsH+3knAYslgCKMTxvJOcrDdWPZkxjQQL9LPo+utEkFMcMHpqgSUUI/ B5gMdrt2SJchaii39M/R9EblabGdASflcPjWotc5h+C/mrCNti2kC9AYLeuF5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=67dc576bae6e624ae46962ad187e0e31fece6688 commit 67dc576bae6e624ae46962ad187e0e31fece6688 Author: Andrew Turner AuthorDate: 2022-02-07 11:47:04 +0000 Commit: Andrew Turner CommitDate: 2022-02-07 11:56:04 +0000 Fix the signal code on 32-bit breakpoints on arm64 When debugging 32-bit programs a debugger may insert a instruction that will raise the undefined instruction trap. The kernel handles these by raising a SIGTRAP, however the code was incorrect. Fix this by using the expected TRAP_BRKPT signal code. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/undefined.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/undefined.c b/sys/arm64/arm64/undefined.c index 2cdb5f9a97fb..1feb242db060 100644 --- a/sys/arm64/arm64/undefined.c +++ b/sys/arm64/arm64/undefined.c @@ -105,7 +105,7 @@ gdb_trapper(vm_offset_t va, uint32_t insn, struct trapframe *frame, ksiginfo_init_trap(&ksi); ksi.ksi_signo = SIGTRAP; - ksi.ksi_code = TRAP_TRACE; + ksi.ksi_code = TRAP_BRKPT; ksi.ksi_addr = (void *)va; trapsignal(td, &ksi); return 1;