Switch from BSD-style u_intXX_t to ISO C99 uintXX_t.

This commit is contained in:
Marius Strobl 2004-05-22 00:47:26 +00:00
parent 27d8bee2a7
commit 980284e38f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=129568
2 changed files with 5 additions and 5 deletions

View File

@ -78,7 +78,7 @@
* Hopefully sun will choose not to change the bit numbers. * Hopefully sun will choose not to change the bit numbers.
*/ */
#define itype(sz) u_int ## sz ## _t #define itype(sz) uint ## sz ## _t
#define atomic_cas_32(p, e, s) casa(p, e, s, __ASI_ATOMIC) #define atomic_cas_32(p, e, s) casa(p, e, s, __ASI_ATOMIC)
#define atomic_cas_64(p, e, s) casxa(p, e, s, __ASI_ATOMIC) #define atomic_cas_64(p, e, s) casxa(p, e, s, __ASI_ATOMIC)

View File

@ -61,14 +61,14 @@ struct thread;
#define StoreStore MMASK_GEN(M_StoreStore) #define StoreStore MMASK_GEN(M_StoreStore)
#define casa(rs1, rs2, rd, asi) ({ \ #define casa(rs1, rs2, rd, asi) ({ \
u_int __rd = (u_int32_t)(rd); \ u_int __rd = (uint32_t)(rd); \
__asm __volatile("casa [%1] %2, %3, %0" \ __asm __volatile("casa [%1] %2, %3, %0" \
: "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \
__rd; \ __rd; \
}) })
#define casxa(rs1, rs2, rd, asi) ({ \ #define casxa(rs1, rs2, rd, asi) ({ \
u_long __rd = (u_int64_t)(rd); \ u_long __rd = (uint64_t)(rd); \
__asm __volatile("casxa [%1] %2, %3, %0" \ __asm __volatile("casxa [%1] %2, %3, %0" \
: "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \ : "+r" (__rd) : "r" (rs1), "n" (asi), "r" (rs2)); \
__rd; \ __rd; \
@ -150,7 +150,7 @@ int fasword32(u_long asi, void *addr, uint32_t *val);
} while (0) } while (0)
#define rd(name) ({ \ #define rd(name) ({ \
u_int64_t __sr; \ uint64_t __sr; \
__asm __volatile("rd %%" #name ", %0" : "=r" (__sr) :); \ __asm __volatile("rd %%" #name ", %0" : "=r" (__sr) :); \
__sr; \ __sr; \
}) })
@ -161,7 +161,7 @@ int fasword32(u_long asi, void *addr, uint32_t *val);
} while (0) } while (0)
#define rdpr(name) ({ \ #define rdpr(name) ({ \
u_int64_t __pr; \ uint64_t __pr; \
__asm __volatile("rdpr %%" #name", %0" : "=r" (__pr) :); \ __asm __volatile("rdpr %%" #name", %0" : "=r" (__pr) :); \
__pr; \ __pr; \
}) })