From nobody Mon Dec 06 15:56:27 2021 X-Original-To: dev-commits-src-all@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 CE1F818C57FD; Mon, 6 Dec 2021 15:56:34 +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 4J77Mg4hqTz4bMM; Mon, 6 Dec 2021 15:56:31 +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 019B966BA; Mon, 6 Dec 2021 15:56:28 +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 1B6FuRk0033565; Mon, 6 Dec 2021 15:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FuRDd033564; Mon, 6 Dec 2021 15:56:27 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:56:27 GMT Message-Id: <202112061556.1B6FuRDd033564@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 5a4382ed5371 - stable/13 - riscv: Make machine/regs.h self-contained List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a4382ed5371bea7b3623e96b91b61e6eb66505e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806193; 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=pPNqcBct3tN7pvF0gENwPpiuov0hDTxWPS22g/ncybk=; b=SiieKure1G8hlOdKcTJ+Cw6uQh/3ohzKauUr5DZ5S7ms3bUgxNHqgwhtmvb60bx/6WINYF qg34c3iiZxPYrhLQXIWbNCSUU2UyE8O4+7UZwNFnXF4xGYaAMGwQ6N7NT6s3k959i1mQcp vNGIItMgDisvr9njBgi3WjTVy6BvHemJ+sJvk5Oi4BKVknW761UCgw4bv2j259vGHv6xqR LTsaaMgCOw6iGvQlc3y2V3X6nn8QhNPFUVUegEHNarxW9EacRWPNpS/MNMXFcQgNhIoyV+ KcRrVUafZj7Ym9kqU4SPqCVw8zJjVr+nmRweTzdZOU4/hiSQK+KrSoICJNggGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806193; a=rsa-sha256; cv=none; b=Oz66JUj/WThjZQmZGY5+wkEQOos/ON2pZPmeoE5URU5Zj4b9zaXVVZ8km59mZfAGioZ8fz 8nUnMt6fZveb0PCoLe5zk2HbEnaefgiy65wqYSkaUzM4OCuuCpFy7vMzLLtcoZCvQybHEl F6M5LNb9BkArrrvb1rKeMomJNxLRvFVPcCgEHwiEYhJ9kwJPJj3ItaTs3eZU9c9QpmtZvM prDRHQfGPc3zGM6cNC3irKN/KufJo+oKJxLF7lwrjXQtwun3VqyNAFEVzCSNSDGQUJ69jh eWe+KHfa9yHnR2vI3w2tanCpfR2ooeZaOdJxSqfZ5XmnyBYnARvyb29kghNn7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5a4382ed5371bea7b3623e96b91b61e6eb66505e commit 5a4382ed5371bea7b3623e96b91b61e6eb66505e Author: Warner Losh AuthorDate: 2021-11-24 01:47:26 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:55:56 +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 (cherry picked from commit d2bf8c544adc4b080d3ab15d4f08f501b689d964) --- 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 9e94b4a5768d..08f953f128de 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 {