Commit 8aa58de3 authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Tomasz Zawadzki
Browse files

memory.h: overall cleanup 



Replace repeating (VALUE_2MB - 1) with MASK_2MB, etc.
No functional changes, just cleanup.

Change-Id: I6a9ebfb0ebebd3c29f6174c57ea01738b26feddc
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1040


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent f1d292a3

include/spdk_internal/memory.h

+8 −8
Original line number Diff line number Diff line
@@ -41,17 +41,17 @@ extern "C" { 
#endif



#define SHIFT_2MB		21 /* (1 << 21) == 2MB */

#define MASK_2MB		((1ULL << SHIFT_2MB) - 1)

#define VALUE_2MB		(1 << SHIFT_2MB)

#define VALUE_2MB		(1ULL << SHIFT_2MB)

#define MASK_2MB		(VALUE_2MB - 1)



#define SHIFT_4KB		12 /* (1 << 12) == 4KB */

#define MASK_4KB		((1ULL << SHIFT_4KB) - 1)

#define VALUE_4KB		(1 << SHIFT_4KB)

#define VALUE_4KB		(1ULL << SHIFT_4KB)

#define MASK_4KB		(VALUE_4KB - 1)



#define _2MB_OFFSET(ptr)	(((uintptr_t)(ptr)) &  (VALUE_2MB - 1))

#define _2MB_PAGE(ptr)		((ptr) & ~(0x200000 - 1))

#define FLOOR_2MB(x)		(((uintptr_t)x) / VALUE_2MB) << SHIFT_2MB

#define CEIL_2MB(x)		((((uintptr_t)x) + VALUE_2MB - 1) / VALUE_2MB) << SHIFT_2MB

#define _2MB_OFFSET(ptr)	(((uintptr_t)(ptr)) & MASK_2MB)

#define _2MB_PAGE(ptr)		FLOOR_2MB((uintptr_t)(ptr))

#define FLOOR_2MB(x)		(((uintptr_t)(x)) & ~MASK_2MB)

#define CEIL_2MB(x)		FLOOR_2MB(((uintptr_t)(x)) + VALUE_2MB - 1)



#ifdef __cplusplus

}