From nobody Wed Nov 24 04:22:16 2021 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 0C3681889B1F; Wed, 24 Nov 2021 04:22:17 +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 4HzSX83vSVz3Hhh; Wed, 24 Nov 2021 04:22:16 +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 585DE239A6; Wed, 24 Nov 2021 04:22:16 +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 1AO4MGe2049641; Wed, 24 Nov 2021 04:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO4MG7x049640; Wed, 24 Nov 2021 04:22:16 GMT (envelope-from git) Date: Wed, 24 Nov 2021 04:22:16 GMT Message-Id: <202111240422.1AO4MG7x049640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d2bf8c544adc - main - riscv: Make machine/regs.h self-contained 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2bf8c544adc4b080d3ab15d4f08f501b689d964 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637727736; 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=DXyya0dUMhuX6TIEVYHJqjl6VSKU0V40xPfl6Kg0ZX4=; b=CglxuqXZJEH59NaL+WVGRUad/a5x/o2VXlj+Plxg9XAGRm9QaeoptoGjdRVfooWdPfEYPX WovaBExPSCJ3bk4FuPjar7p29Aq8NY7WeD8ie8kVo0qgT3wAhdHhmaeID/3FPXbw8YJiFJ alnwXn1HZfXsOqxJjzF6z6u1pi4NkRP96MFRLN0zq29J0tGgG07UCLXrv+AB4aeDcn5p1D csqzV/85aeEY7+E9Am+BDO8SFQ1xu2H8hECkq8SZrfH3mPmItoaen49M5iddeUJytG0ZIQ /ej3J84UL2uRboPBfxzsRfNDuQ02clns4iLqLYS2HGVyD36Up5/gydmf/jFznQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637727736; a=rsa-sha256; cv=none; b=XTyS/Et2c+OC4pf71GjEuWKF2leyObWk5EsVM2LPyXRDa05N2kFquIazAoLWlzt+REy5Jt VDCwwppYEXZvp2VFKGm6+5BP5opnw02kpdm7CBHqcD0PrWLLYPnXwx1VzAgzlVKqGDHFi9 u0Qfor8GRL9nxuO6dJTxWdgqgRv4u+MtGrjNU6fDSrMdp/IHEhVcN7WtxwNMA6OiE+d6e8 oWFlmo/FBWGvePgY4EipEtKniJ1xfv10BvhYAKOAcK3mcKwfF3mZjx9w7xdxa0y9/yt7/t hfKjZjM3FerykbaSg5kTxYNWjWSYYACo4nQLi06ir0U2tIOOTekx+kGBU2kEPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2bf8c544adc4b080d3ab15d4f08f501b689d964 commit d2bf8c544adc4b080d3ab15d4f08f501b689d964 Author: Warner Losh AuthorDate: 2021-11-24 01:47:26 +0000 Commit: Warner Losh CommitDate: 2021-11-24 04:21:17 +0000 riscv: Make machine/regs.h self-contained Make sys/reg.h self-contained by making riscv's machine/reg.h self-contained. Sponsored by: Netflix --- sys/riscv/include/reg.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys/riscv/include/reg.h b/sys/riscv/include/reg.h index 003e696e30e3..d76b500bce1b 100644 --- a/sys/riscv/include/reg.h +++ b/sys/riscv/include/reg.h @@ -37,21 +37,23 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#include + struct reg { - uint64_t ra; /* return address */ - uint64_t sp; /* stack pointer */ - uint64_t gp; /* global pointer */ - uint64_t tp; /* thread pointer */ - uint64_t t[7]; /* temporaries */ - uint64_t s[12]; /* saved registers */ - uint64_t a[8]; /* function arguments */ - uint64_t sepc; /* exception program counter */ - uint64_t sstatus; /* status register */ + __uint64_t ra; /* return address */ + __uint64_t sp; /* stack pointer */ + __uint64_t gp; /* global pointer */ + __uint64_t tp; /* thread pointer */ + __uint64_t t[7]; /* temporaries */ + __uint64_t s[12]; /* saved registers */ + __uint64_t a[8]; /* function arguments */ + __uint64_t sepc; /* exception program counter */ + __uint64_t sstatus; /* status register */ }; struct fpreg { - uint64_t fp_x[32][2]; /* Floating point registers */ - uint64_t fp_fcsr; /* Floating point control reg */ + __uint64_t fp_x[32][2]; /* Floating point registers */ + __uint64_t fp_fcsr; /* Floating point control reg */ }; struct dbreg {