X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Futil.h;h=18c513e2eb8fa869057a8e33da1def1a8d6990b0;hb=41765ea063cbab26ae05e7259ffc8a7c85db2f5d;hp=789e63e4e23daa266799d1b24b566ae10b67eba7;hpb=f57fab6afe62f2a476ef4afa1842c81722816451;p=gbajam22

diff --git a/src/util.h b/src/util.h
index 789e63e..18c513e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,7 @@
 #ifndef UTIL_H_
 #define UTIL_H_
 
+#include <stdlib.h>
 #include <stdint.h>
 
 #define wait_vblank() \
@@ -33,4 +34,19 @@ void fillblock_16byte(void *dest, uint32_t val, int count);
 void *get_pc(void);
 void *get_sp(void);
 
+int ispow2(unsigned int x);
+
+/* Non-failing versions of malloc/calloc/realloc. They never return 0, they call
+ * demo_abort on failure. Use the macros, don't call the *_impl functions.
+ */
+#define malloc_nf(sz)	malloc_nf_impl(sz, __FILE__, __LINE__)
+void *malloc_nf_impl(size_t sz, const char *file, int line);
+#define calloc_nf(n, sz)	calloc_nf_impl(n, sz, __FILE__, __LINE__)
+void *calloc_nf_impl(size_t num, size_t sz, const char *file, int line);
+#define realloc_nf(p, sz)	realloc_nf_impl(p, sz, __FILE__, __LINE__)
+void *realloc_nf_impl(void *p, size_t sz, const char *file, int line);
+#define strdup_nf(s)	strdup_nf_impl(s, __FILE__, __LINE__)
+char *strdup_nf_impl(const char *s, const char *file, int line);
+
+
 #endif	/* UTIL_H_ */