X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Futil.h;h=f93efc8ba2f29bbea15c9915dbf0b14d7ab6e115;hb=ce7eae94dd17b0c24685a19b85baacbfb1146bcf;hp=35d1a971381ba158b00f3d834437ffadafba8cc8;hpb=574b83282bd01d6b9a70843238bbcbab1590fe76;p=dosdemo

diff --git a/src/util.h b/src/util.h
index 35d1a97..f93efc8 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,7 @@
 #ifndef UTIL_H_
 #define UTIL_H_
 
+#include <stdlib.h>
 #include "inttypes.h"
 
 #ifdef __GNUC__
@@ -235,9 +236,22 @@ static unsigned int __inline get_cs(void)
 #endif
 
 unsigned int get_cs(void);
-#define get_cpl()	((int)(get_cs() & 7))
+#define get_cpl()	((int)(get_cs() & 3))
 
 void get_msr(uint32_t msr, uint32_t *low, uint32_t *high);
 void set_msr(uint32_t msr, uint32_t low, uint32_t high);
 
+
+/* 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);
+
+
+
 #endif	/* UTIL_H_ */