Re: [ros-diffs] [gdalsnes] 18403: alloc multiple of 16 bytes

[Alex Ionescu]

gdalsnes(a)svn.reactos.com wrote:
>   alloc multiple of 16 bytes
>  Modified: trunk/reactos/lib/crt/stdlib/malloc.c
>    
>  ------------------------------------------------------------------------
>  *Modified: trunk/reactos/lib/crt/stdlib/malloc.c*
>  --- trunk/reactos/lib/crt/stdlib/malloc.c	2005-10-10 19:08:57 UTC (rev 18402)
>  +++ trunk/reactos/lib/crt/stdlib/malloc.c	2005-10-10 20:18:07 UTC (rev 18403)
>  @@ -25,6 +25,10 @@
>   #include <stdlib.h>
>   #include <malloc.h>
>   
>    
>  +
>  +/* fixme: should have this in common header */
>  +#define ROUND_UP(a,b) ((a + (b-1)) & ~(b-1))
>     
helper.s
>   +
>    
>   extern HANDLE hHeap;
>   
>   /*
>  @@ -32,7 +36,7 @@
>    
>    */
>   void* malloc(size_t _size)
>   {
>    
>  -   return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _size);
>    
>  +   return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16));
>    
>   }
>   
>   /*
>  @@ -48,7 +52,7 @@
>    
>    */
>   void* calloc(size_t _nmemb, size_t _size)
>   {
>    
>  -   return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, _nmemb*_size);
>    
>  +   return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_UP(_nmemb*_size, 16) );
>    
>   }
>   
>   /*
>  @@ -57,8 +61,8 @@
>    
>   void* realloc(void* _ptr, size_t _size)
>   {
>      if (!_ptr)
>    
>  -      return HeapAlloc(hHeap, 0, _size);
>  -   return HeapReAlloc(hHeap, 0, _ptr, _size);
>    
>  +      return HeapAlloc(hHeap, 0, ROUND_UP(_size, 16));
>  +   return HeapReAlloc(hHeap, 0, _ptr, ROUND_UP(_size, 16));
>    
>   }
>   
>   /*
>  @@ -66,7 +70,7 @@
>    
>    */
>   void* _expand(void* _ptr, size_t _size)
>   {
>    
>  -   return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, _size);
>    
>  +   return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_UP(_size, 16));
>    
>   }
>   
>   /*
>     
Ever heard of HEAP_ALIGN_16?

Best regards,
Alex Ionescu

[Gunnar Dalsnes]

>   
>  Ever heard of HEAP_ALIGN_16? 
Never. How so?

G.

>   
>  Best regards,
>  Alex Ionescu
>  _______________________________________________
>  Ros-dev mailing list
>  Ros-dev(a)reactos.org
>  http://www.reactos.org/mailman/listinfo/ros-dev
>  
>  
>

[Alex Ionescu]

Gunnar Dalsnes wrote:
> >  
> >  Ever heard of HEAP_ALIGN_16? 
>  Never. How so?
>
>  G.
>
> >
> > Best regards,
> > Alex Ionescu
> > _______________________________________________
> > Ros-dev mailing list
> > Ros-dev(a)reactos.org
> > http://www.reactos.org/mailman/listinfo/ros-dev
> >
> > 
My bad:

#define HEAP_CREATE_ALIGN_16            0x00010000      // winnt Create
heap with 16 byte alignment (obsolete)

Best regards,
Alex Ionescu

[Thomas Weidenmueller]

Alex Ionescu wrote:
>   #define HEAP_CREATE_ALIGN_16            0x00010000    
>  // winnt Create
>  heap with 16 byte alignment (obsolete) 
alignment != granularity

... or does it imply 16 byte granularity in this case?

- Thomas