michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "sys/util.h: helper macro to perform pointer difference"

Browse source 
This reverts commit 755cc644cc.

This approach is problematic in several ways.  First, `intptr_t` could
cause undefined behavior in the subtraction when the pointer converts to
a negative value.  Except in weird cases where the sign of the pointer
identifies a memory domain (like kernel vs userspace) I'm unaware of any
valid use of `intptr_t`.

Second, this macro was created to address a special need that cannot
rely on defined behavior: i.e. to ensure that data definitions are
placed in contiguous space and access is provided through linker-defined
symbols, for which the language required alignment and continuity is not
guaranteed.

A macro that calculates the span between linker symbols has very
different semantics than one that calculates the difference between
pointers.  Replace the global PTR_DIFF with a documented local macro
that tests what's necessary without risking integer overflow.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
This commit is contained in:
Peter A. Bigot 2019-07-12 22:04:15 -05:00 • committed by Anas Nashif
commit 765c06376c
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/sys/util.h
View file

@ -26,9 +26,6 @@
#define POINTER_TO_INT(x) ((intptr_t) (x)) #define POINTER_TO_INT(x) ((intptr_t) (x))
#define INT_TO_POINTER(x) ((void *) (intptr_t) (x)) #define INT_TO_POINTER(x) ((void *) (intptr_t) (x))
/* Helper to get the difference between two pointers as an int */
#define PTR_DIFF(y, x) ((int)((intptr_t)(y) - (intptr_t)(x)))
#if !(defined (__CHAR_BIT__) && defined (__SIZEOF_LONG__)) #if !(defined (__CHAR_BIT__) && defined (__SIZEOF_LONG__))
# error Missing required predefined macros for BITS_PER_LONG calculation # error Missing required predefined macros for BITS_PER_LONG calculation
#endif #endif

21
tests/subsys/usb/desc_sections/src/desc_sections.c
View file

@ -198,41 +198,46 @@ static void check_endpoint_allocation(struct usb_desc_header *head)
} }
} }
/* Determine the number of bytes spanned between two linker-defined
* symbols that are normally interpreted as pointers.
*/
#define SYMBOL_SPAN(_ep, _sp) (int)(intptr_t)((uintptr_t)(_ep) - (uintptr_t)(_sp))
static void test_desc_sections(void) static void test_desc_sections(void)
{ {
struct usb_desc_header *head; struct usb_desc_header *head;
TC_PRINT("__usb_descriptor_start %p\n", __usb_descriptor_start); TC_PRINT("__usb_descriptor_start %p\n", __usb_descriptor_start);
TC_PRINT("__usb_descriptor_end %p\n", __usb_descriptor_end); TC_PRINT("__usb_descriptor_end %p\n", __usb_descriptor_end);
TC_PRINT("USB Descriptor table size %d\n", TC_PRINT("USB Descriptor table span %d\n",
PTR_DIFF(__usb_descriptor_end, __usb_descriptor_start)); SYMBOL_SPAN(__usb_descriptor_end, __usb_descriptor_start));
TC_PRINT("__usb_data_start %p\n", __usb_data_start); TC_PRINT("__usb_data_start %p\n", __usb_data_start);
TC_PRINT("__usb_data_end %p\n", __usb_data_end); TC_PRINT("__usb_data_end %p\n", __usb_data_end);
TC_PRINT("USB Configuration data size %d\n", TC_PRINT("USB Configuration data span %d\n",
PTR_DIFF(__usb_data_end, __usb_data_start)); SYMBOL_SPAN(__usb_data_end, __usb_data_start));
TC_PRINT("sizeof usb_cfg_data %zu\n", sizeof(struct usb_cfg_data)); TC_PRINT("sizeof usb_cfg_data %zu\n", sizeof(struct usb_cfg_data));
LOG_DBG("Starting logs"); LOG_DBG("Starting logs");
LOG_HEXDUMP_DBG((u8_t *)__usb_descriptor_start, LOG_HEXDUMP_DBG((u8_t *)__usb_descriptor_start,
PTR_DIFF(__usb_descriptor_end, __usb_descriptor_start), SYMBOL_SPAN(__usb_descriptor_end, __usb_descriptor_start),
"USB Descriptor table section"); "USB Descriptor table section");
LOG_HEXDUMP_DBG((u8_t *)__usb_data_start, LOG_HEXDUMP_DBG((u8_t *)__usb_data_start,
PTR_DIFF(__usb_data_end, __usb_data_start), SYMBOL_SPAN(__usb_data_end, __usb_data_start),
"USB Configuratio structures section"); "USB Configuratio structures section");
head = (struct usb_desc_header *)__usb_descriptor_start; head = (struct usb_desc_header *)__usb_descriptor_start;
zassert_not_null(head, NULL); zassert_not_null(head, NULL);
zassert_equal(PTR_DIFF(__usb_descriptor_end, __usb_descriptor_start), zassert_equal(SYMBOL_SPAN(__usb_descriptor_end, __usb_descriptor_start),
133, NULL); 133, NULL);
/* Calculate number of structures */ /* Calculate number of structures */
zassert_equal(__usb_data_end - __usb_data_start, NUM_INSTANCES, NULL); zassert_equal(__usb_data_end - __usb_data_start, NUM_INSTANCES, NULL);
zassert_equal(PTR_DIFF(__usb_data_end, __usb_data_start), zassert_equal(SYMBOL_SPAN(__usb_data_end, __usb_data_start),
NUM_INSTANCES * sizeof(struct usb_cfg_data), NULL); NUM_INSTANCES * sizeof(struct usb_cfg_data), NULL);
check_endpoint_allocation(head); check_endpoint_allocation(head);