mv shlr/heap into libr/include/heap (#19285)

libr/core/Makefile

@@ -13,7 +13,6 @@ OBJS+=vmenus.o vmenus_graph.o vmenus_zigns.o zdiff.o citem.o
 OBJS+=task.o panels.o pseudo.o vmarks.o anal_tp.o anal_objc.o blaze.o cundo.o
 OBJS+=cproject.o
 
-CFLAGS+=-I../../shlr/heap/include
 CFLAGS+=-DR2_PLUGIN_INCORE -I../../shlr
 LDFLAGS+=${DL_LIBS}
 LDFLAGS+=${CLOCK_LDFLAGS}

libr/core/meson.build

@@ -71,10 +71,8 @@ r_core_sources = [
 ]
 
 r_core_inc = []
-r_core_inc += ['../../shlr/heap/include']
 if host_machine.system() == 'windows'
   r_core_sources += 'windows_heap.c'
-  r_core_inc += ['../../shlr/heap/include/r_windows']
 endif
 r_core_inc = [platform_inc, include_directories(r_core_inc)]
 

libr/core/windows_heap.c

@@ -2,7 +2,7 @@
 
 #include <r_core.h>
 #include <tlhelp32.h>
-#include "r_windows/windows_heap.h"
+#include "heap/r_windows.h"
 #include "../debug/p/native/maps/windows_maps.h"
 
 /*

libr/debug/Makefile

@@ -32,8 +32,6 @@ endif
 
 
 ifeq ($(OSTYPE),windows)
-## XXX unify all the debugger code
-CFLAGS+=-I$(SHLR)/heap/include/r_windows
 OBJS+=$(addprefix p/,$(NATIVE_OBJS))
 endif
 ifeq ($(OSTYPE),$(filter $(OSTYPE),gnulinux android))

libr/include/r_heap_jemalloc.h

@@ -5,10 +5,9 @@
 extern "C" {
 #endif
 
-#include "r_jemalloc/internal/jemalloc_internal.h"
+#include "heap/r_jemalloc/internal/jemalloc_internal.h"
 
 #define INC_HEAP32 1
-#include "r_heap_jemalloc.h"
 #undef INC_HEAP32
 
 #undef GH

libr/io/Makefile

@@ -12,8 +12,6 @@ OBJS+=io.o io_plugin.o io_map.o io_desc.o io_cache.o p_cache.o undo.o ioutils.o
 OBJS+=io_bank.o io_submap.o
 
 CFLAGS+=-Wall -DR2_PLUGIN_INCORE
-## XXX unify all the debugger code
-CFLAGS+=-I$(SHLR)/heap/include/r_windows
 
 include ../socket/deps.mk
 include $(SHLR)/ar/deps.mk

shlr/heap/README.md

@@ -1,7 +0,0 @@
-Trying to escape from the libr/core mess, we should put all the heap stuff into a separate place and use it from anal/heap.c
-
-TODO
-
-* remove all use of assert
-* remove unused statements
-* convert macros into C code, this should be a runtime library, not a compile time one