diff options
author | tijl <tijl@FreeBSD.org> | 2012-03-18 18:44:42 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2012-03-18 18:44:42 +0000 |
commit | f36691a4af70956621d759efff296eb1fa3d40fa (patch) | |
tree | 5f8ef6312ee98c7f4d7405d685cc5a17beb78786 /sys/amd64 | |
parent | 9f2db48abf173a8cab4e99c0144dcfb5c5d67732 (diff) | |
download | FreeBSD-src-f36691a4af70956621d759efff296eb1fa3d40fa.zip FreeBSD-src-f36691a4af70956621d759efff296eb1fa3d40fa.tar.gz |
Use exact width integer types in amd64/i386 reg.h to prepare for a merge.
The only real change is replacing long with int on i386.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/include/reg.h | 62 |
1 files changed, 31 insertions, 31 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 */ |