From nobody Tue Nov 23 23:48:56 2021 X-Original-To: dev-commits-src-branches@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 CE73E189147C; Tue, 23 Nov 2021 23:48:57 +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 4HzLSn31p3z4mrb; Tue, 23 Nov 2021 23:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1D76A1F9F7; Tue, 23 Nov 2021 23:48:57 +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 1ANNmufu077897; Tue, 23 Nov 2021 23:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANNmup0077896; Tue, 23 Nov 2021 23:48:56 GMT (envelope-from git) Date: Tue, 23 Nov 2021 23:48:56 GMT Message-Id: <202111232348.1ANNmup0077896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c8c2d908dd47 - stable/13 - arm64, riscv: Fix TRAF_PC() to return the PC, not the return address. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8c2d908dd477d6413eaf1f788df88c73ae73c5b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637711337; 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=4OompjYSN/2KqJHVos5IougF2nl2bpSs+GF9SdqwGzU=; b=jUE1KX7ErI/MDSB4AdHBiIYn8JoVcoy2XR7Fn2JYjcc2o0wWcUt2iaKCvs+MFkfI3VTnPy I5VgVZ1UUQNUDcibGRgENCxxxGszHCc4Q9paoMo25eFun5zmjd8lg5v4H1At9x7BjCKxv1 DfLXCVlcJNIvuRPmrqxDpGc0PKKSZKb2LQIvaKDdE/Dlg5h1hY6vq29SVBKde3iT9AOajl MJBNPV1sg98sDPr9VeHT4hQscfCUQWDxQPzq+vgL+jR3ZRRHWUOelxsS4XqJuMsgKXoVMy 80UO0mLHjdQnmDs+JpB7BKu2B/udW0yA+LH3mQd/CXgIpAupTLngar5BOcobUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637711337; a=rsa-sha256; cv=none; b=w5Nszqt6//f4lzM0HyCxQzaRwPASDUy/GnYFdWbygXK8gLcrQW2kU5pEWxL6FUTN2PfY+W 6OXuyewDw5i1/wm85tmYTaLxxz7dmTAa6ZKhu8n4CQhc7MpAo5f0cWp/SOHhJnv2lW4sM1 2TJt3+SbDno16hrPqDkd4yeLdS1kZlDOVwelykTvQmofr426699X1CaP9PvMk8so8338LZ bv77hzWb60A/8OzhLUuS5PwWZrET5apXVYKUKPMD8NlHh8B3KUzWHZOiG1dmVCFwCdCtpO G2IS/QEiIhwnzuHF6SwAiOe9m5YlQhkpcvB+AqFf2TvvZvHENchCTIuTcvRbpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c8c2d908dd477d6413eaf1f788df88c73ae73c5b commit c8c2d908dd477d6413eaf1f788df88c73ae73c5b Author: John Baldwin AuthorDate: 2021-10-01 18:53:12 +0000 Commit: John Baldwin CommitDate: 2021-11-23 23:48:07 +0000 arm64, riscv: Fix TRAF_PC() to return the PC, not the return address. Reviewed by: mhorne Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D31969 (cherry picked from commit 0177102173f39e17366a32eb22653aeb5248c355) --- sys/arm64/include/cpu.h | 2 +- sys/riscv/include/cpu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 0b1aa2d93b03..c926372a0ec6 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -45,7 +45,7 @@ #include #include -#define TRAPF_PC(tfp) ((tfp)->tf_lr) +#define TRAPF_PC(tfp) ((tfp)->tf_elr) #define TRAPF_USERMODE(tfp) (((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t) #define cpu_getstack(td) ((td)->td_frame->tf_sp) diff --git a/sys/riscv/include/cpu.h b/sys/riscv/include/cpu.h index 79c6f730f2a6..453a6af1a0f8 100644 --- a/sys/riscv/include/cpu.h +++ b/sys/riscv/include/cpu.h @@ -41,7 +41,7 @@ #include #include -#define TRAPF_PC(tfp) ((tfp)->tf_ra) +#define TRAPF_PC(tfp) ((tfp)->tf_sepc) #define TRAPF_USERMODE(tfp) (((tfp)->tf_sstatus & SSTATUS_SPP) == 0) #define cpu_getstack(td) ((td)->td_frame->tf_sp)