1 files changed, 26 insertions, 20 deletions

diff --git a/erts/emulator/beam/beam_catches.c b/erts/emulator/beam/beam_catches.c
index e795b4efbd..a550ec5ad0 100644
--- a/erts/emulator/beam/beam_catches.c
+++ b/erts/emulator/beam/beam_catches.c
@@ -22,21 +22,27 @@
 #endif
 #include "sys.h"
 #include "beam_catches.h"
+#include "global.h"
 
-/* XXX: should use dynamic reallocation */
-#define TABSIZ (16*1024)
-static struct {
+/* R14B04 has about 380 catches when starting erlang */
+#define DEFAULT_TABSIZE (1024)
+typedef struct {
     BeamInstr *cp;
     unsigned cdr;
-} beam_catches[TABSIZ];
+} beam_catch_t;
 
 static int free_list;
 static unsigned high_mark;
+static unsigned tabsize;
+static beam_catch_t *beam_catches;
 
 void beam_catches_init(void)
 {
+    tabsize   = DEFAULT_TABSIZE;
     free_list = -1;
     high_mark = 0;
+
+    beam_catches = erts_alloc(ERTS_ALC_T_CODE, sizeof(beam_catch_t)*DEFAULT_TABSIZE);
 }
 
 unsigned beam_catches_cons(BeamInstr *cp, unsigned cdr)
@@ -50,16 +56,21 @@ unsigned beam_catches_cons(BeamInstr *cp, unsigned cdr)
      * This avoids the need to initialise the free list in
      * beam_catches_init(), which would cost O(TABSIZ) time.
      */
-    if( (i = free_list) >= 0 ) {
+    if( free_list >= 0 ) {
+	i = free_list;
 	free_list = beam_catches[i].cdr;
-    } else if( (i = high_mark) < TABSIZ ) {
-	high_mark = i + 1;
+    } else if( high_mark < tabsize ) {
+	i = high_mark;
+	high_mark++;
     } else {
-	fprintf(stderr, "beam_catches_cons: no free slots :-(\r\n");
-	exit(1);
+	/* No free slots and table is full: realloc table */
+	tabsize      = 2*tabsize;
+	beam_catches = erts_realloc(ERTS_ALC_T_CODE, beam_catches, sizeof(beam_catch_t)*tabsize);
+	i = high_mark;
+	high_mark++;
     }
 
-    beam_catches[i].cp = cp;
+    beam_catches[i].cp  = cp;
     beam_catches[i].cdr = cdr;
 
     return i;
@@ -67,10 +78,8 @@ unsigned beam_catches_cons(BeamInstr *cp, unsigned cdr)
 
 BeamInstr *beam_catches_car(unsigned i)
 {
-    if( i >= TABSIZ ) {
-	fprintf(stderr,
-		"beam_catches_car: index %#x is out of range\r\n", i);
-	abort();
+    if( i >= tabsize ) {
+	erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i);
     }
     return beam_catches[i].cp;
 }
@@ -80,18 +89,15 @@ void beam_catches_delmod(unsigned head, BeamInstr *code, unsigned code_bytes)
     unsigned i, cdr;
 
     for(i = head; i != (unsigned)-1;) {
-	if( i >= TABSIZ ) {
-	    fprintf(stderr,
-		    "beam_catches_delmod: index %#x is out of range\r\n", i);
-	    abort();
+	if( i >= tabsize ) {
+	    erl_exit(1, "beam_catches_delmod: index %#x is out of range\r\n", i);
 	}
 	if( (char*)beam_catches[i].cp - (char*)code >= code_bytes ) {
-	    fprintf(stderr,
+	    erl_exit(1,
 		    "beam_catches_delmod: item %#x has cp %#lx which is not "
 		    "in module's range [%#lx,%#lx[\r\n",
 		    i, (long)beam_catches[i].cp,
 		    (long)code, (long)((char*)code + code_bytes));
-	    abort();
 	}
 	beam_catches[i].cp = 0;
 	cdr = beam_catches[i].cdr;