Change pointers for heap allocation

[muddle-interpreter.git] / src / alloc.h

diff --git a/src/alloc.h b/src/alloc.h
index 4cab1d0313a5d44eb74306c4bb6fabd4c2956a7b..2c7e6a041b56dae49d70735184335bc7bce17865 100644 (file)
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -23,53 +23,21 @@ License along with this file. If not, see
 #include <stdbool.h>
 #include <stdint.h>
 
-/// 0, or a "pointer" to an object allocated in the pool
 typedef uint32_t pool_ptr;
-/// 0, or a "pointer" to an object allocated in the heap
 typedef int32_t heap_ptr;
 
 typedef union pool_object pool_object;
 typedef union object object;
 
-extern char *vhp_base;         // object
-extern char *vhp;              // object
-
 pool_object *POOL_OBJECT (pool_ptr p);
-
-// TODO make (heap_ptr)0 nullish
-static inline object *
-OBJECT_OF_HEAP_PTR (heap_ptr p)
-{
-  assert (p >= 0);
-  return (object *) (vhp_base + (p << 4));
-}
+object *HEAP_OBJECT (heap_ptr p);
 
 pool_ptr pool_alloc (uint32_t len);
-
-static inline heap_ptr
-HEAP_PTR_OF_OBJECT (object * p)
-{
-  assert ((uintptr_t) p >= (uintptr_t) vhp_base);
-  heap_ptr h = (heap_ptr) ((uintptr_t) p - (uintptr_t) vhp_base);
-  return h;
-}
-
-static inline object *
-heap_alloc (uint32_t len)
-{
-  enum
-  { DOPE_LEN = 1 };
-  char *p = vhp;
-  vhp += (len + DOPE_LEN) << 4;
-  return (object *) p;
-}
+heap_ptr heap_alloc (uint32_t len);
 
 // given a headerless array of objects of known size,
 // copy it backwards into newly-allocated pool space
-pool_ptr pool_copy_array_rev (const pool_object * objs, uint32_t len);
-
-// given a headerless array of objects of known size,
-// copy it backwards into a newly-allocated vector body
-heap_ptr heap_copy_array_rev (const object * objs, uint32_t len);
+pool_ptr pool_copy_array_rev (const pool_object *objs, uint32_t len);
+heap_ptr heap_copy_array_rev (const object *objs, uint32_t len);
 
 #endif // ALLOC_H