Remove stale code for hybrid heap and incremental GC

The hybrid heap emulator was last working in the non-SMP R11B
run-time system. When the constant pools were introduced in R12B,
the hybrid heap emulator was not updated to handle them.

At this point, the harm from reduced readability of the code is
greater than any potential usefulness of keeping the code.

5 files changed, 3 insertions, 363 deletions

diff --git a/erts/emulator/hipe/hipe_bif0.c b/erts/emulator/hipe/hipe_bif0.c
index 26f183dc25..af593229c0 100644
--- a/erts/emulator/hipe/hipe_bif0.c
+++ b/erts/emulator/hipe/hipe_bif0.c
@@ -1093,10 +1093,8 @@ BIF_RETTYPE hipe_bifs_make_fun_3(BIF_ALIST_3)
     if (is_not_nil(free_vars))
 	BIF_ERROR(BIF_P, BADARG);
 
-#ifndef HYBRID /* FIND ME! */
     funp->next = MSO(BIF_P).funs;
     MSO(BIF_P).funs = funp;
-#endif
 
     BIF_RET(make_fun(funp));
 }
diff --git a/erts/emulator/hipe/hipe_bif1.c b/erts/emulator/hipe/hipe_bif1.c
index 87cdfb8c7a..64de754e18 100644
--- a/erts/emulator/hipe/hipe_bif1.c
+++ b/erts/emulator/hipe/hipe_bif1.c
@@ -449,7 +449,7 @@ BIF_RETTYPE hipe_bifs_gc_info_0(BIF_ALIST_0)
 BIF_RETTYPE hipe_bifs_shared_gc_info_0(BIF_ALIST_0)
 {
 #ifdef __BENCHMARK__
-#if !(defined(BM_COUNTERS) && defined(HYBRID))
+#if !(defined(BM_COUNTERS))
     Uint minor_global_gc = 0;
     Uint major_global_gc = 0;
 #endif
@@ -459,17 +459,9 @@ BIF_RETTYPE hipe_bifs_shared_gc_info_0(BIF_ALIST_0)
 #endif
     Eterm *hp;
 
-#if defined(HYBRID)
-    Uint tmp_used_heap = (Uint)((BIF_P->htop - BIF_P->heap) +
-				(OLD_HTOP(BIF_P) - OLD_HEAP(BIF_P)) +
-				MBUF_SIZE(BIF_P));
-    Uint tmp_allocated_heap = (Uint)((BIF_P->hend - BIF_P->heap) +
-				     (OLD_HEND(BIF_P) - OLD_HEAP(BIF_P)) +
-				     MBUF_SIZE(BIF_P));
-#else
     Uint tmp_used_heap = 0;
     Uint tmp_allocated_heap = 0;
-#endif
+
     hp = HAlloc(BIF_P, 7);
     BIF_RET(TUPLE6(hp,
 		   make_small((uint)minor_global_gc),
@@ -486,7 +478,7 @@ BIF_RETTYPE hipe_bifs_shared_gc_info_0(BIF_ALIST_0)
 BIF_RETTYPE hipe_bifs_incremental_gc_info_0(BIF_ALIST_0)
 {
 #ifdef __BENCHMARK__
-#if !(defined(BM_COUNTERS) && defined(INCREMENTAL))
+#if !defined(BM_COUNTERS)
     Uint minor_gc_cycles = 0;
     Uint major_gc_cycles = 0;
     Uint minor_gc_stages = 0;
@@ -512,17 +504,6 @@ BIF_RETTYPE hipe_bifs_gc_info_clear_0(BIF_ALIST_0)
 #ifdef BM_COUNTERS
     minor_gc	    = 0;
     major_gc	    = 0;
-#ifdef HYBRID
-    minor_global_gc = 0;
-    major_global_gc = 0;
-    gc_in_copy	    = 0;
-#ifdef INCREMENTAL
-    minor_gc_cycles = 0;
-    major_gc_cycles = 0;
-    minor_gc_stages = 0;
-    major_gc_stages = 0;
-#endif
-#endif
 #endif
 
 #ifdef BM_HEAP_SIZES
diff --git a/erts/emulator/hipe/hipe_gc.c b/erts/emulator/hipe/hipe_gc.c
index e0575c35ff..07e4b8a4d6 100644
--- a/erts/emulator/hipe/hipe_gc.c
+++ b/erts/emulator/hipe/hipe_gc.c
@@ -237,329 +237,3 @@ void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
     }
     abort();
 }
-
-#ifdef HYBRID
-
-#ifdef INCREMENTAL
-Eterm *ma_fullsweep_nstack(Process *p, Eterm *n_htop, Eterm *n_hend)
-{
-    /* known nstack walk state */
-    Eterm *nsp;
-    Eterm *nsp_end;
-    const struct sdesc *sdesc;
-    unsigned int sdesc_size;
-    unsigned long ra;
-    unsigned int i;
-    unsigned int mask;
-    /* arch-specific nstack walk state */
-    struct nstack_walk_state walk_state;
-
-    if (!nstack_walk_init_check(p))
-	return n_htop;
-
-    nsp = nstack_walk_nsp_begin(p);
-    nsp_end = nstack_walk_nsp_end(p);
-
-    sdesc = nstack_walk_init_sdesc(p, &walk_state);
-
-    for (;;) {
-	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
-	    if (nsp == nsp_end)
-		return n_htop;
-	    fprintf(stderr, "%s: passed end of stack\r\n", __FUNCTION__);
-	    break;
-	}
-	sdesc_size = nstack_walk_frame_size(sdesc);
-	i = 0;
-	mask = sdesc->livebits[0];
-	for (;;) {
-	    if (mask & 1) {
-		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
-		Eterm val = *nsp_i;
-		Eterm *obj_ptr = ptr_val(val);
-		switch (primary_tag(val)) {
-		  case TAG_PRIMARY_LIST:
-		    COPYMARK_CONS(obj_ptr, n_htop, nsp_i, n_hend);
-		    break;
-		  case TAG_PRIMARY_BOXED:
-		    COPYMARK_BOXED(obj_ptr, n_htop, nsp_i, n_hend);
-		    break;
-		  default:
-		    break;
-		}
-	    }
-	    if (++i >= sdesc_size)
-		break;
-	    if (i & 31)
-		mask >>= 1;
-	    else
-		mask = sdesc->livebits[i >> 5];
-	}
-	ra = nstack_walk_frame_ra(nsp, sdesc);
-	if (ra == (unsigned long)nbif_stack_trap_ra)
-	    ra = (unsigned long)p->hipe.ngra;
-	sdesc = hipe_find_sdesc(ra);
-	nsp = nstack_walk_next_frame(nsp, sdesc_size);
-    }
-    abort();
-}
-
-void ma_gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
-{
-    /* known nstack walk state */
-    Eterm *nsp;
-    Eterm *nsp_end;
-    const struct sdesc *sdesc;
-    unsigned int sdesc_size;
-    unsigned long ra;
-    unsigned int i;
-    unsigned int mask;
-    /* arch-specific nstack walk state */
-    struct nstack_walk_state walk_state;
-
-    /* ma_gensweep-specific state */
-    Eterm *low_water, *high_water, *surface;
-    Eterm *n_htop;
-    Eterm *old_htop;
-
-    if (!nstack_walk_init_check(p))
-	return;
-
-    nsp = nstack_walk_nsp_begin(p);
-    nsp_end = nstack_walk_nsp_end(p);
-
-    low_water = global_heap;
-    //high_water = global_high_water;
-    surface = global_htop;
-
-    old_htop = *ptr_old_htop;
-    n_htop = *ptr_n_htop;
-
-    sdesc = nstack_walk_init_sdesc(p, &walk_state);
-
-    for (;;) {
-	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
-	    if (nsp == nsp_end) {
-		*ptr_old_htop = old_htop;
-		*ptr_n_htop = n_htop;
-		return;
-	    }
-	    fprintf(stderr, "%s: passed end of stack\r\n", __FUNCTION__);
-	    break;
-	}
-	sdesc_size = nstack_walk_frame_size(sdesc);
-	i = 0;
-	mask = sdesc->livebits[0];
-	for (;;) {
-	    if (mask & 1) {
-		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
-		Eterm gval = *nsp_i;
-		if (is_boxed(gval)) {
-		    Eterm *ptr = boxed_val(gval);
-		    Eterm val = *ptr;
-		    if (MY_IS_MOVED(val)) {
-			*nsp_i = val;
-		    } else if (ptr_within(ptr, low_water, high_water)) {
-			MOVE_BOXED(ptr, val, old_htop, nsp_i);
-		    } else if (ptr_within(ptr, high_water, surface)) {
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
-		    }
-		} else if (is_list(gval)) {
-		    Eterm *ptr = list_val(gval);
-		    Eterm val = *ptr;
-		    if (is_non_value(val)) {
-			*nsp_i = ptr[1];
-		    } else if (ptr_within(ptr, low_water, high_water)) {
-			MOVE_CONS(ptr, val, old_htop, nsp_i);
-		    } else if (ptr_within(ptr, high_water, surface)) {
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
-		    }
-		}
-	    }
-	    if (++i >= sdesc_size)
-		break;
-	    if (i & 31)
-		mask >>= 1;
-	    else
-		mask = sdesc->livebits[i >> 5];
-	}
-	ra = nstack_walk_frame_ra(nsp, sdesc);
-	if (ra == (unsigned long)nbif_stack_trap_ra)
-	    ra = (unsigned long)p->hipe.ngra;
-	sdesc = hipe_find_sdesc(ra);
-	nsp = nstack_walk_next_frame(nsp, sdesc_size);
-    }
-    abort();
-}
-
-#else /* not INCREMENTAL */
-
-Eterm *ma_fullsweep_nstack(Process *p, Eterm *n_htop)
-{
-    /* known nstack walk state */
-    Eterm *nsp;
-    Eterm *nsp_end;
-    const struct sdesc *sdesc;
-    unsigned int sdesc_size;
-    unsigned long ra;
-    unsigned int i;
-    unsigned int mask;
-    /* arch-specific nstack walk state */
-    struct nstack_walk_state walk_state;
-
-    /* ma_fullsweep-specific state */
-    Eterm *gheap = global_heap;
-    Eterm *ghtop = global_htop;
-    Eterm *goheap = global_old_heap;
-    Eterm *gohtop = global_old_htop;
-
-    if (!nstack_walk_init_check(p))
-	return n_htop;
-
-    nsp = nstack_walk_nsp_begin(p);
-    nsp_end = nstack_walk_nsp_end(p);
-
-    sdesc = nstack_walk_init_sdesc(p, &walk_state);
-
-    for (;;) {
-	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
-	    if (nsp == nsp_end)
-		return n_htop;
-	    fprintf(stderr, "%s: passed end of stack\r\n", __FUNCTION__);
-	    break;
-	}
-	sdesc_size = nstack_walk_frame_size(sdesc);
-	i = 0;
-	mask = sdesc->livebits[0];
-	for (;;) {
-	    if (mask & 1) {
-		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
-		Eterm gval = *nsp_i;
-		if (is_boxed(gval)) {
-		    Eterm *ptr = boxed_val(gval);
-		    Eterm val = *ptr;
-		    if (MY_IS_MOVED(val)) {
-			*nsp_i = val;
-		    } else if (ptr_within(ptr, gheap, ghtop)) {
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
-		    } else if (ptr_within(ptr, goheap, gohtop)) {
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
-		    }
-		} else if (is_list(gval)) {
-		    Eterm *ptr = list_val(gval);
-		    Eterm val = *ptr;
-		    if (is_non_value(val)) {
-			*nsp_i = ptr[1];
-		    } else if (ptr_within(ptr, gheap, ghtop)) {
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
-		    } else if (ptr_within(ptr, gheap, ghtop)) {
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
-		    }
-		}
-	    }
-	    if (++i >= sdesc_size)
-		break;
-	    if (i & 31)
-		mask >>= 1;
-	    else
-		mask = sdesc->livebits[i >> 5];
-	}
-	ra = nstack_walk_frame_ra(nsp, sdesc);
-	if (ra == (unsigned long)nbif_stack_trap_ra)
-	    ra = (unsigned long)p->hipe.ngra;
-	sdesc = hipe_find_sdesc(ra);
-	nsp = nstack_walk_next_frame(nsp, sdesc_size);
-    }
-    abort();
-}
-
-void ma_gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop)
-{
-    /* known nstack walk state */
-    Eterm *nsp;
-    Eterm *nsp_end;
-    const struct sdesc *sdesc;
-    unsigned int sdesc_size;
-    unsigned long ra;
-    unsigned int i;
-    unsigned int mask;
-    /* arch-specific nstack walk state */
-    struct nstack_walk_state walk_state;
-
-    /* ma_gensweep-specific state */
-    Eterm *low_water, *high_water, *surface;
-    Eterm *n_htop;
-    Eterm *old_htop;
-
-    if (!nstack_walk_init_check(p))
-	return;
-
-    nsp = nstack_walk_nsp_begin(p);
-    nsp_end = nstack_walk_nsp_end(p);
-
-    low_water = global_heap;
-    high_water = global_high_water;
-    surface = global_htop;
-
-    old_htop = *ptr_old_htop;
-    n_htop = *ptr_n_htop;
-
-    sdesc = nstack_walk_init_sdesc(p, &walk_state);
-
-    for (;;) {
-	if (nstack_walk_nsp_reached_end(nsp, nsp_end)) {
-	    if (nsp == nsp_end) {
-		*ptr_old_htop = old_htop;
-		*ptr_n_htop = n_htop;
-		return;
-	    }
-	    fprintf(stderr, "%s: passed end of stack\r\n", __FUNCTION__);
-	    break;
-	}
-	sdesc_size = nstack_walk_frame_size(sdesc);
-	i = 0;
-	mask = sdesc->livebits[0];
-	for (;;) {
-	    if (mask & 1) {
-		Eterm *nsp_i = nstack_walk_frame_index(nsp, i);
-		Eterm gval = *nsp_i;
-		if (is_boxed(gval)) {
-		    Eterm *ptr = boxed_val(gval);
-		    Eterm val = *ptr;
-		    if (MY_IS_MOVED(val)) {
-			*nsp_i = val;
-		    } else if (ptr_within(ptr, low_water, high_water)) {
-			MOVE_BOXED(ptr, val, old_htop, nsp_i);
-		    } else if (ptr_within(ptr, high_water, surface)) {
-			MOVE_BOXED(ptr, val, n_htop, nsp_i);
-		    }
-		} else if (is_list(gval)) {
-		    Eterm *ptr = list_val(gval);
-		    Eterm val = *ptr;
-		    if (is_non_value(val)) {
-			*nsp_i = ptr[1];
-		    } else if (ptr_within(ptr, low_water, high_water)) {
-			MOVE_CONS(ptr, val, old_htop, nsp_i);
-		    } else if (ptr_within(ptr, high_water, surface)) {
-			MOVE_CONS(ptr, val, n_htop, nsp_i);
-		    }
-		}
-	    }
-	    if (++i >= sdesc_size)
-		break;
-	    if (i & 31)
-		mask >>= 1;
-	    else
-		mask = sdesc->livebits[i >> 5];
-	}
-	ra = nstack_walk_frame_ra(nsp, sdesc);
-	if (ra == (unsigned long)nbif_stack_trap_ra)
-	    ra = (unsigned long)p->hipe.ngra;
-	sdesc = hipe_find_sdesc(ra);
-	nsp = nstack_walk_next_frame(nsp, sdesc_size);
-    }
-    abort();
-}
-#endif /* INCREMENTAL */
-
-#endif /* HYBRID */
diff --git a/erts/emulator/hipe/hipe_mkliterals.c b/erts/emulator/hipe/hipe_mkliterals.c
index d07d14028c..6e9041c84a 100644
--- a/erts/emulator/hipe/hipe_mkliterals.c
+++ b/erts/emulator/hipe/hipe_mkliterals.c
@@ -467,15 +467,11 @@ static const struct rts_param {
     int value;
 } rts_params[] = {
     { 1, "P_OFF_HEAP_FUNS",
-#if !defined(HYBRID)
       1, offsetof(struct process, off_heap.first)
-#endif
     },
 
     { 4, "EFT_NEXT",
-#if !defined(HYBRID)
       1, offsetof(struct erl_fun_thing, next)
-#endif
     },
 
     /* These are always defined, but their values depend on the
diff --git a/erts/emulator/hipe/hipe_stack.h b/erts/emulator/hipe/hipe_stack.h
index 4c14b4a519..4e3076caf5 100644
--- a/erts/emulator/hipe/hipe_stack.h
+++ b/erts/emulator/hipe/hipe_stack.h
@@ -116,13 +116,4 @@ extern int hipe_fill_stacktrace(Process*, int, Eterm**);
 extern Eterm *fullsweep_nstack(Process *p, Eterm *n_htop);
 extern void gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop);
 
-#ifdef HYBRID
-#ifdef INCREMENTAL
-extern Eterm *ma_fullsweep_nstack(Process *p, Eterm *n_htop, Eterm *n_hend);
-#else
-extern Eterm *ma_fullsweep_nstack(Process *p, Eterm *n_htop);
-#endif
-extern void ma_gensweep_nstack(Process *p, Eterm **ptr_old_htop, Eterm **ptr_n_htop);
-#endif /* HYBRID */
-
 #endif /* HIPE_STACK_H */