Date: Wed, 24 Nov 2021 04:22:15 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 8ee8271e2297 - main - arm64: Make machine/reg.h self contained Message-ID: <202111240422.1AO4MFDB049614@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee8271e22975f77f8c147c81470b8eaee3bbab9 commit 8ee8271e22975f77f8c147c81470b8eaee3bbab9 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-11-24 01:01:01 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-11-24 04:21:17 +0000 arm64: Make machine/reg.h self contained Make sys/reg.h includable on aarch64 by making machine/reg.h self-contained: Include sys/_types.h and use __uint* instead of uint*. Sponsored by: Netflix --- sys/arm64/include/reg.h | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/arm64/include/reg.h b/sys/arm64/include/reg.h index d7c3354bfd2f..bb151af55ba6 100644 --- a/sys/arm64/include/reg.h +++ b/sys/arm64/include/reg.h @@ -33,12 +33,14 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#include <sys/_types.h> + struct reg { - uint64_t x[30]; - uint64_t lr; - uint64_t sp; - uint64_t elr; - uint32_t spsr; + __uint64_t x[30]; + __uint64_t lr; + __uint64_t sp; + __uint64_t elr; + __uint32_t spsr; }; struct reg32 { @@ -51,8 +53,8 @@ struct reg32 { struct fpreg { __uint128_t fp_q[32]; - uint32_t fp_sr; - uint32_t fp_cr; + __uint32_t fp_sr; + __uint32_t fp_cr; }; struct fpreg32 { @@ -60,20 +62,20 @@ struct fpreg32 { }; struct dbreg { - uint8_t db_debug_ver; - uint8_t db_nbkpts; - uint8_t db_nwtpts; - uint8_t db_pad[5]; + __uint8_t db_debug_ver; + __uint8_t db_nbkpts; + __uint8_t db_nwtpts; + __uint8_t db_pad[5]; struct { - uint64_t dbr_addr; - uint32_t dbr_ctrl; - uint32_t dbr_pad; + __uint64_t dbr_addr; + __uint32_t dbr_ctrl; + __uint32_t dbr_pad; } db_breakregs[16]; struct { - uint64_t dbw_addr; - uint32_t dbw_ctrl; - uint32_t dbw_pad; + __uint64_t dbw_addr; + __uint32_t dbw_ctrl; + __uint32_t dbw_pad; } db_watchregs[16]; };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111240422.1AO4MFDB049614>