git: 76d6bb6a6e8f - main - powerpc: Make machine/reg.h self-contained
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Nov 2021 04:22:17 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=76d6bb6a6e8f61ed267ac245cdf2d293deade8d7 commit 76d6bb6a6e8f61ed267ac245cdf2d293deade8d7 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-11-24 01:50:20 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-11-24 04:21:18 +0000 powerpc: Make machine/reg.h self-contained Make powerpc*'s machine/reg.h self-contained so that sys/reg.h can be self-contained. Sponsored by: Netflix --- sys/powerpc/include/reg.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h index c0bf807ac75e..a5e2f601eaca 100644 --- a/sys/powerpc/include/reg.h +++ b/sys/powerpc/include/reg.h @@ -4,14 +4,16 @@ #ifndef _POWERPC_REG_H_ #define _POWERPC_REG_H_ +#include <sys/_types.h> + /* Must match struct trapframe */ struct reg { - register_t fixreg[32]; - register_t lr; - register_t cr; - register_t xer; - register_t ctr; - register_t pc; + __register_t fixreg[32]; + __register_t lr; + __register_t cr; + __register_t xer; + __register_t ctr; + __register_t pc; }; struct fpreg { @@ -21,10 +23,10 @@ struct fpreg { /* Must match pcb.pcb_vec */ struct vmxreg { - uint32_t vr[32][4]; - uint32_t pad[2]; - uint32_t vrsave; - uint32_t vscr; + __uint32_t vr[32][4]; + __uint32_t pad[2]; + __uint32_t vrsave; + __uint32_t vscr; }; struct dbreg { @@ -34,12 +36,12 @@ struct dbreg { #ifdef __LP64__ /* Must match struct trapframe */ struct reg32 { - int32_t fixreg[32]; - int32_t lr; - int32_t cr; - int32_t xer; - int32_t ctr; - int32_t pc; + __int32_t fixreg[32]; + __int32_t lr; + __int32_t cr; + __int32_t xer; + __int32_t ctr; + __int32_t pc; }; struct fpreg32 {