* eval.c (plus_s, prof_s): New symbol global variables.

(op_prof, me_pprof): New static functions.
(eval_init): Intern prof symbol, store in prof_s.
Captured interned + symbol in plus_s. Register prof operator and pprof
macro.

* gc.c (gc_bytes): New global variable.
(more): Use nse function chk_malloc_gc_more instead of chk_malloc.
(make_obj): Increment gc_bytes.

* lib.c (malloc_bytes): New global variable.
(chk_malloc, chk_realloc): Increment malloc_bytes.
(chk_calloc): Bugfix: incorrect size in recursion into oom_realloc.
Incorrect calculation of malloc_high_bound.  Increment malloc_bytes.
(chk_malloc_gc_more): New function.

* lib.h (alloc_bytes_t): New typedef.
(malloc_bytes, gc_bytes): Declared.
(chk_malloc_gc_more): Declared.

* stream.c (format_s): New symbol global.
(stream_init): format_s inited.
format_s used to register formatv function.

* stream.h (format_s): Declared.

* txr.1: Documented prof and pprof.

* genvim.txr: Recognize reg_fun calls with intern
followed by a preceding assignment or other syntax.

* txr.vim: Updated.

1 files changed, 4 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index 3686cd32..44ee97c6 100644
--- a/gc.c
+++ b/gc.c
@@ -75,6 +75,8 @@ static val free_list, *free_tail = &free_list;
 static heap_t *heap_list;
 static val heap_min_bound, heap_max_bound;
 
+alloc_bytes_t gc_bytes;
+
 int gc_enabled = 1;
 
 #if CONFIG_GEN_GC
@@ -120,7 +122,7 @@ void protect(val *first, ...)
 
 static void more(void)
 {
-  heap_t *heap = (heap_t *) chk_malloc(sizeof *heap);
+  heap_t *heap = (heap_t *) chk_malloc_gc_more(sizeof *heap);
   obj_t *block = heap->block, *end = heap->block + HEAP_SIZE;
 
   if (end > heap_max_bound)
@@ -178,6 +180,7 @@ val make_obj(void)
       ret->t.gen = 0;
       freshobj[freshobj_idx++] = ret;
 #endif
+      gc_bytes += sizeof (obj_t);
       return ret;
     }