Changeset 50172 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jan 23, 2014 5:21:08 AM (11 years ago)

Author:

vboxsync

Message:

Try to fix git commit 75f2c56558aee0f3476f170d2ccd96a28eeba710
imported as r91735 (before it falls through proverbial cracks).
Problem also reported upstream.

Apply LWIP_MEM_ALIGN() to memory bases for MEMP_OVERFLOW_CHECK == 1
too. Compensate for potential misalignment of memory bases by
providing padding with LWIP_MEM_ALIGN_BUFFER() like it's done for
memp_memory[].

Compile-tested only with appriate options that are not currently used.
Otherwise, the same binary code is generated.

File:

• trunk/src/VBox/Devices/Network/lwip-new/src/core/memp.c (modified) (5 diffs)

trunk/src/VBox/Devices/Network/lwip-new/src/core/memp.c

@@ -202 +202 @@
  */
 #define LWIP_MEMPOOL(name,num,size,desc) u8_t memp_memory_ ## name ## _base \
-  [((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))];   
+  [LWIP_MEM_ALIGN_BUFFER((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))];   
 #include "lwip/memp_std.h"
 
@@ -214 +214 @@
 
 /** This is the actual memory used by the pools (all pools in one big block). */
-static u8_t memp_memory[MEM_ALIGNMENT - 1 
+static u8_t memp_memory[MEM_ALIGNMENT - 1 /* XXX: LWIP_MEM_ALIGN_BUFFER */
 #define LWIP_MEMPOOL(name,num,size,desc) + ( (num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size) ) )
 #include "lwip/memp_std.h"
@@ -335 +335 @@
   for (i = 0; i < MEMP_MAX; ++i) {
 #if MEMP_SEPARATE_POOLS
-    p = (struct memp *)(memp_bases[i]);
+    p = (struct memp *)LWIP_MEM_ALIGN(memp_bases[i]);
 #endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {
@@ -347 +347 @@
   for (i = 0; i < MEMP_MAX; ++i) {
 #if MEMP_SEPARATE_POOLS
-    p = (struct memp *)(memp_bases[i]);
+    p = (struct memp *)LWIP_MEM_ALIGN(memp_bases[i]);
 #endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {
@@ -371 +371 @@
   for (i = 0; i < MEMP_MAX; ++i) {
 #if MEMP_SEPARATE_POOLS
-    p = (struct memp *)(memp_bases[i]);
+    p = (struct memp *)LWIP_MEM_ALIGN(memp_bases[i]);
 #endif /* MEMP_SEPARATE_POOLS */
     for (j = 0; j < memp_num[i]; ++j) {