Merge branch 'maint'

* maint:
  Remove stale code for hybrid heap and incremental GC
  Remove the hipe_bifs:show_message_area/0 BIF
  Remove support for erlang:system_info(global_heaps_size)
  Remove the erlang:garbage_collect_message_area/0 BIF
  Remove workarounds for hybrid and shared heaps in test suites

Conflicts:
	erts/doc/src/erlang.xml
	erts/emulator/beam/erl_message.c
	erts/emulator/beam/erl_process.c
	erts/emulator/beam/erl_process.h
	erts/emulator/hipe/hipe_bif2.tab
	lib/hipe/cerl/erl_bif_types.erl

1 files changed, 0 insertions, 55 deletions

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index 3973d1d378..15a937289d 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -26,7 +26,6 @@
 #include "erl_vm.h"
 #include "global.h"
 #include "erl_process.h"
-#include "erl_nmgc.h"
 #include "error.h"
 #include "bif.h"
 #include "big.h"
@@ -249,20 +248,6 @@ void** beam_ops;
 extern int count_instructions;
 #endif
 
-#if defined(HYBRID)
-#define SWAPIN             \
-    g_htop = global_htop;  \
-    g_hend = global_hend;  \
-    HTOP = HEAP_TOP(c_p);  \
-    E = c_p->stop
-
-#define SWAPOUT            \
-    global_htop = g_htop;  \
-    global_hend = g_hend;  \
-    HEAP_TOP(c_p) = HTOP;  \
-    c_p->stop = E
-
-#else
 #define SWAPIN             \
     HTOP = HEAP_TOP(c_p);  \
     E = c_p->stop
@@ -290,8 +275,6 @@ extern int count_instructions;
 
 #define LIGHT_SWAPIN HTOP = HEAP_TOP(c_p)
 
-#endif
-
 #ifdef FORCE_HEAP_FRAGS
 #  define HEAP_SPACE_VERIFIED(Words) do { \
       c_p->space_verified = (Words);	  \
@@ -453,36 +436,6 @@ extern int count_instructions;
      CHECK_TERM(r(0));				\
   } while (0)
 
-#ifdef HYBRID
-#ifdef INCREMENTAL
-#define TestGlobalHeap(Nh, Live, hp)                                    \
-  do {                                                                  \
-    unsigned need = (Nh);                                               \
-    ASSERT(global_heap <= g_htop && g_htop <= global_hend);             \
-    SWAPOUT;                                                            \
-    reg[0] = r(0);                                                      \
-    FCALLS -= need;                                                     \
-    (hp) = IncAlloc(c_p,need,reg,(Live));                               \
-    r(0) = reg[0];                                                      \
-    SWAPIN;                                                             \
-  } while (0)
-#else
-#define TestGlobalHeap(Nh, Live, hp)                                    \
-  do {                                                                  \
-    unsigned need = (Nh);                                               \
-    ASSERT(global_heap <= g_htop && g_htop <= global_hend);             \
-    if (g_hend - g_htop < need) {                                       \
-       SWAPOUT;                                                         \
-       reg[0] = r(0);                                                   \
-       FCALLS -= erts_global_garbage_collect(c_p, need, reg, (Live));   \
-       r(0) = reg[0];                                                   \
-       SWAPIN;                                                          \
-    }                                                                   \
-    (hp) = global_htop;                                                 \
-  } while (0)
-#endif
-#endif /* HYBRID */
-
 #define Init(N) make_blank(yb(N))
 
 #define Init2(Y1, Y2) do { make_blank(Y1); make_blank(Y2); } while (0)
@@ -1174,12 +1127,6 @@ void process_main(void)
      */
     register Eterm* HTOP REG_htop = NULL;
 
-
-#ifdef HYBRID
-     Eterm *g_htop;
-     Eterm *g_hend;
-#endif
-
     /* Stack pointer.  Grows downwards; points
      * to last item pushed (normally a saved
      * continuation pointer).
@@ -6534,10 +6481,8 @@ new_fun(Process* p, Eterm* reg, ErlFunEntry* fe, int num_free)
     hp = funp->env;
     erts_refc_inc(&fe->refc, 2);
     funp->thing_word = HEADER_FUN;
-#ifndef HYBRID /* FIND ME! */
     funp->next = MSO(p).first;
     MSO(p).first = (struct erl_off_heap_header*) funp;
-#endif
     funp->fe = fe;
     funp->num_free = num_free;
     funp->creator = p->id;