zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-14 15:41:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add EDUKE32_PREDICT_TRUE to our *alloc macros and flip the condition around so the true branch is first

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7660 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-05-19 03:55:10 +00:00 committed by Christoph Oelckers
parent 6395909290
commit badf4eab6d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/build/include/compat.h
View file

@ -1270,19 +1270,19 @@ void *handle_memerr(void *);
static FORCE_INLINE char *xstrdup(const char *s) static FORCE_INLINE char *xstrdup(const char *s)
{ {
char *ptr = Bstrdup(s); char *ptr = Bstrdup(s);
return (ptr == NULL) ? (char *)handle_memerr(ptr) : ptr; return (EDUKE32_PREDICT_TRUE(ptr != NULL)) ? ptr : (char *)handle_memerr(ptr);
} }
static FORCE_INLINE void *xmalloc(const bsize_t size) static FORCE_INLINE void *xmalloc(const bsize_t size)
{ {
void *ptr = Bmalloc(size); void *ptr = Bmalloc(size);
return (ptr == NULL) ? handle_memerr(ptr) : ptr; return (EDUKE32_PREDICT_TRUE(ptr != NULL)) ? ptr : handle_memerr(ptr);
} }
static FORCE_INLINE void *xcalloc(const bsize_t nmemb, const bsize_t size) static FORCE_INLINE void *xcalloc(const bsize_t nmemb, const bsize_t size)
{ {
void *ptr = Bcalloc(nmemb, size); void *ptr = Bcalloc(nmemb, size);
return (ptr == NULL) ? handle_memerr(ptr) : ptr; return (EDUKE32_PREDICT_TRUE(ptr != NULL)) ? ptr : handle_memerr(ptr);
} }
static FORCE_INLINE void *xrealloc(void * const ptr, const bsize_t size) static FORCE_INLINE void *xrealloc(void * const ptr, const bsize_t size)
@ -1293,14 +1293,14 @@ static FORCE_INLINE void *xrealloc(void * const ptr, const bsize_t size)
// - ptr == NULL makes realloc() behave like malloc() // - ptr == NULL makes realloc() behave like malloc()
// - size == 0 make it behave like free() if ptr != NULL // - size == 0 make it behave like free() if ptr != NULL
// Since we want to catch an out-of-mem in the first case, this leaves: // Since we want to catch an out-of-mem in the first case, this leaves:
return (newptr == NULL && size != 0) ? handle_memerr(ptr) : newptr; return (EDUKE32_PREDICT_TRUE(newptr != NULL || size == 0)) ? newptr: handle_memerr(ptr);
} }
#if !defined NO_ALIGNED_MALLOC #if !defined NO_ALIGNED_MALLOC
static FORCE_INLINE void *xaligned_alloc(const bsize_t alignment, const bsize_t size) static FORCE_INLINE void *xaligned_alloc(const bsize_t alignment, const bsize_t size)
{ {
void *ptr = Baligned_alloc(alignment, size); void *ptr = Baligned_alloc(alignment, size);
return (ptr == NULL) ? handle_memerr(ptr) : ptr; return (EDUKE32_PREDICT_TRUE(ptr != NULL)) ? ptr : handle_memerr(ptr);
} }
#else #else
# define xaligned_alloc(alignment, size) xmalloc(size) # define xaligned_alloc(alignment, size) xmalloc(size)