From owner-svn-src-all@freebsd.org Tue Dec 1 18:08:22 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F24734AFC77; Tue, 1 Dec 2020 18:08:22 +0000 (UTC) (envelope-from jhb@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ClqpZ6YpZz4f2j; Tue, 1 Dec 2020 18:08:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D490519DD4; Tue, 1 Dec 2020 18:08:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B1I8M0I047382; Tue, 1 Dec 2020 18:08:22 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B1I8MIG047380; Tue, 1 Dec 2020 18:08:22 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <202012011808.0B1I8MIG047380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 1 Dec 2020 18:08:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368242 - head/sys/cddl/dev/dtrace/riscv X-SVN-Group: head X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: head/sys/cddl/dev/dtrace/riscv X-SVN-Commit-Revision: 368242 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Dec 2020 18:08:23 -0000 Author: jhb Date: Tue Dec 1 18:08:22 2020 New Revision: 368242 URL: https://svnweb.freebsd.org/changeset/base/368242 Log: Use uintptr_t for pointers in stack frames. This catches up to the changes made to struct unwind_state in r364180. Reviewed by: mhorne Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D27360 Modified: head/sys/cddl/dev/dtrace/riscv/dtrace_isa.c Modified: head/sys/cddl/dev/dtrace/riscv/dtrace_isa.c ============================================================================== --- head/sys/cddl/dev/dtrace/riscv/dtrace_isa.c Tue Dec 1 17:17:22 2020 (r368241) +++ head/sys/cddl/dev/dtrace/riscv/dtrace_isa.c Tue Dec 1 18:08:22 2020 (r368242) @@ -85,9 +85,9 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, in __asm __volatile("mv %0, sp" : "=&r" (sp)); - state.fp = (uint64_t)__builtin_frame_address(0); + state.fp = (uintptr_t)__builtin_frame_address(0); state.sp = sp; - state.pc = (uint64_t)dtrace_getpcstack; + state.pc = (uintptr_t)dtrace_getpcstack; while (depth < pcstack_limit) { if (unwind_frame(&state)) @@ -266,9 +266,9 @@ dtrace_getstackdepth(int aframes) __asm __volatile("mv %0, sp" : "=&r" (sp)); - state.fp = (uint64_t)__builtin_frame_address(0); + state.fp = (uintptr_t)__builtin_frame_address(0); state.sp = sp; - state.pc = (uint64_t)dtrace_getstackdepth; + state.pc = (uintptr_t)dtrace_getstackdepth; do { done = unwind_frame(&state);