|
@@ -299,7 +299,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size)
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 2, stw_##e##_p, \
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 4, stl_##e##_p, \
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 8, stq_##e##_p, abort)))) \
|
|
|
- ((hptr), (x)), 0)
|
|
|
+ ((hptr), (x)), (void)0)
|
|
|
|
|
|
#define __get_user_e(x, hptr, e) \
|
|
|
((x) = (typeof(*hptr))( \
|
|
@@ -307,7 +307,7 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size)
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 2, lduw_##e##_p, \
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 4, ldl_##e##_p, \
|
|
|
__builtin_choose_expr(sizeof(*(hptr)) == 8, ldq_##e##_p, abort)))) \
|
|
|
- (hptr)), 0)
|
|
|
+ (hptr)), (void)0)
|
|
|
|
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
|
# define __put_user(x, hptr) __put_user_e(x, hptr, be)
|
|
@@ -326,9 +326,9 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size)
|
|
|
({ \
|
|
|
abi_ulong __gaddr = (gaddr); \
|
|
|
target_type *__hptr; \
|
|
|
- abi_long __ret; \
|
|
|
+ abi_long __ret = 0; \
|
|
|
if ((__hptr = lock_user(VERIFY_WRITE, __gaddr, sizeof(target_type), 0))) { \
|
|
|
- __ret = __put_user((x), __hptr); \
|
|
|
+ __put_user((x), __hptr); \
|
|
|
unlock_user(__hptr, __gaddr, sizeof(target_type)); \
|
|
|
} else \
|
|
|
__ret = -TARGET_EFAULT; \
|
|
@@ -339,9 +339,9 @@ static inline int access_ok(int type, abi_ulong addr, abi_ulong size)
|
|
|
({ \
|
|
|
abi_ulong __gaddr = (gaddr); \
|
|
|
target_type *__hptr; \
|
|
|
- abi_long __ret; \
|
|
|
+ abi_long __ret = 0; \
|
|
|
if ((__hptr = lock_user(VERIFY_READ, __gaddr, sizeof(target_type), 1))) { \
|
|
|
- __ret = __get_user((x), __hptr); \
|
|
|
+ __get_user((x), __hptr); \
|
|
|
unlock_user(__hptr, __gaddr, 0); \
|
|
|
} else { \
|
|
|
/* avoid warning */ \
|