diff options
| -rw-r--r-- | sys/amd64/include/reg.h | 62 | ||||
| -rw-r--r-- | sys/i386/include/reg.h | 58 |
2 files changed, 61 insertions, 59 deletions
diff --git a/sys/amd64/include/reg.h b/sys/amd64/include/reg.h index 275a998..3cb8596 100644 --- a/sys/amd64/include/reg.h +++ b/sys/amd64/include/reg.h @@ -45,32 +45,32 @@ * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ struct reg { - register_t r_r15; - register_t r_r14; - register_t r_r13; - register_t r_r12; - register_t r_r11; - register_t r_r10; - register_t r_r9; - register_t r_r8; - register_t r_rdi; - register_t r_rsi; - register_t r_rbp; - register_t r_rbx; - register_t r_rdx; - register_t r_rcx; - register_t r_rax; - uint32_t r_trapno; - uint16_t r_fs; - uint16_t r_gs; - uint32_t r_err; - uint16_t r_es; - uint16_t r_ds; - register_t r_rip; - register_t r_cs; - register_t r_rflags; - register_t r_rsp; - register_t r_ss; + __int64_t r_r15; + __int64_t r_r14; + __int64_t r_r13; + __int64_t r_r12; + __int64_t r_r11; + __int64_t r_r10; + __int64_t r_r9; + __int64_t r_r8; + __int64_t r_rdi; + __int64_t r_rsi; + __int64_t r_rbp; + __int64_t r_rbx; + __int64_t r_rdx; + __int64_t r_rcx; + __int64_t r_rax; + __uint32_t r_trapno; + __uint16_t r_fs; + __uint16_t r_gs; + __uint32_t r_err; + __uint16_t r_es; + __uint16_t r_ds; + __int64_t r_rip; + __int64_t r_cs; + __int64_t r_rflags; + __int64_t r_rsp; + __int64_t r_ss; }; /* @@ -82,17 +82,17 @@ struct fpreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long fpr_env[4]; - unsigned char fpr_acc[8][16]; - unsigned char fpr_xacc[16][16]; - unsigned long fpr_spare[12]; + __uint64_t fpr_env[4]; + __uint8_t fpr_acc[8][16]; + __uint8_t fpr_xacc[16][16]; + __uint64_t fpr_spare[12]; }; /* * Register set accessible via /proc/$pid/dbregs. */ struct dbreg { - unsigned long dr[16]; /* debug registers */ + __uint64_t dr[16]; /* debug registers */ /* Index 0-3: debug address registers */ /* Index 4-5: reserved */ /* Index 6: debug status */ diff --git a/sys/i386/include/reg.h b/sys/i386/include/reg.h index b533348..8eca4f0 100644 --- a/sys/i386/include/reg.h +++ b/sys/i386/include/reg.h @@ -36,6 +36,8 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#include <machine/_types.h> + /* * Indices for registers in `struct trapframe' and `struct regs'. * @@ -78,25 +80,25 @@ * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS. */ struct reg { - unsigned int r_fs; - unsigned int r_es; - unsigned int r_ds; - unsigned int r_edi; - unsigned int r_esi; - unsigned int r_ebp; - unsigned int r_isp; - unsigned int r_ebx; - unsigned int r_edx; - unsigned int r_ecx; - unsigned int r_eax; - unsigned int r_trapno; - unsigned int r_err; - unsigned int r_eip; - unsigned int r_cs; - unsigned int r_eflags; - unsigned int r_esp; - unsigned int r_ss; - unsigned int r_gs; + __uint32_t r_fs; + __uint32_t r_es; + __uint32_t r_ds; + __uint32_t r_edi; + __uint32_t r_esi; + __uint32_t r_ebp; + __uint32_t r_isp; + __uint32_t r_ebx; + __uint32_t r_edx; + __uint32_t r_ecx; + __uint32_t r_eax; + __uint32_t r_trapno; + __uint32_t r_err; + __uint32_t r_eip; + __uint32_t r_cs; + __uint32_t r_eflags; + __uint32_t r_esp; + __uint32_t r_ss; + __uint32_t r_gs; }; /* @@ -108,10 +110,10 @@ struct fpreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long fpr_env[7]; - unsigned char fpr_acc[8][10]; - unsigned long fpr_ex_sw; - unsigned char fpr_pad[64]; + __uint32_t fpr_env[7]; + __uint8_t fpr_acc[8][10]; + __uint32_t fpr_ex_sw; + __uint8_t fpr_pad[64]; }; struct xmmreg { @@ -120,17 +122,17 @@ struct xmmreg { * simplified struct. This may be too much detail. Perhaps * an array of unsigned longs is best. */ - unsigned long xmm_env[8]; - unsigned char xmm_acc[8][16]; - unsigned char xmm_reg[8][16]; - unsigned char xmm_pad[224]; + __uint32_t xmm_env[8]; + __uint8_t xmm_acc[8][16]; + __uint8_t xmm_reg[8][16]; + __uint8_t xmm_pad[224]; }; /* * Register set accessible via /proc/$pid/dbregs. */ struct dbreg { - unsigned int dr[8]; /* debug registers */ + __uint32_t dr[8]; /* debug registers */ /* Index 0-3: debug address registers */ /* Index 4-5: reserved */ /* Index 6: debug status */ |
