summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authornullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-11-29 19:24:28 +0800
committernullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>2018-12-06 09:44:08 +0800
commit3909b6408c0125fe311d49a3029a2806993615f7 (patch)
treea02365a6eb268dce08941968e11e319f3a7fe080 /include
parent1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff)
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
Diffstat (limited to 'include')
-rw-r--r--include/alloc.h (renamed from include/malloc.h)6
-rw-r--r--include/global.h8
2 files changed, 11 insertions, 3 deletions
diff --git a/include/malloc.h b/include/alloc.h
index c215f56c0..f2dcf6d46 100644
--- a/include/malloc.h
+++ b/include/alloc.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_MALLOC_H
-#define GUARD_MALLOC_H
+#ifndef GUARD_ALLOC_H
+#define GUARD_ALLOC_H
#define HEAP_SIZE 0x1C000
#define malloc Alloc
@@ -19,4 +19,4 @@ void *AllocZeroed(u32 size);
void Free(void *pointer);
void InitHeap(void *pointer, u32 size);
-#endif // GUARD_MALLOC_H
+#endif // GUARD_ALLOC_H
diff --git a/include/global.h b/include/global.h
index cc8df049f..1bca4c344 100644
--- a/include/global.h
+++ b/include/global.h
@@ -25,6 +25,14 @@
#define INCBIN_S32 {0}
#endif // IDE support
+// Invalid / Out of Bound Placeholder values
+#define INVALID_U8 0xFF
+#define INVALID_U16 0xFFFF
+#define INVALID_U32 0xFFFFFFFF
+#define INVALID_S8 -1
+#define INVALID_S16 -1
+#define INVALID_S32 -1
+
#define ARRAY_COUNT(array) (size_t)(sizeof(array) / sizeof((array)[0]))
#define SWAP(a, b, temp) \