Merge branch 'bg/remove-stray-sae-support' into dev

* bg/remove-stray-sae-support:
  Remove unsupported erlang:blocking_read_file/1
  Remove stray SAE support

8 files changed, 2 insertions, 254 deletions

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index d767194d4d..eca6121a1e 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -341,7 +341,6 @@ ERLANG_OSTYPE = @ERLANG_OSTYPE@
 
 ENABLE_ALLOC_TYPE_VARS += @ERLANG_OSTYPE@
 
-EMULATOR_EXECUTABLE_SAE = beam_evm$(TF_MARKER)
 EMULATOR_EXECUTABLE_ELIB = beam.elib$(TF_MARKER)
 ifeq ($(TARGET), win32)
 EMULATOR_EXECUTABLE = beam$(TF_MARKER).dll
@@ -406,7 +405,7 @@ endif
 	@set -e ; cd zlib && $(MAKE) clean
 	@set -e ; cd pcre && $(MAKE) clean
 
-.PHONY: all sae zlib pcre clean
+.PHONY: all zlib pcre clean
 
 docs:
 
@@ -640,10 +639,6 @@ $(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)
 $(OBJDIR)/%.elib.o: beam/%.c
 	$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
-# Disable vfork() for sae (then we don't need the child_setup program)
-$(OBJDIR)/sys_sae.o: sys/$(ERLANG_OSTYPE)/sys.c
-	$(CC) -DDISABLE_VFORK=1 $(CFLAGS) $(INCLUDES) -c $< -o $@
-
 $(OBJDIR)/%.kp.o: sys/common/%.c
 	$(CC) -DERTS_KERNEL_POLL_VERSION $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
@@ -689,8 +684,6 @@ endif
 
 INIT_OBJS = $(OBJDIR)/erl_main.o		$(PRELOAD)
 
-INIT_OBJS_SAE = $(OBJDIR)/erl9_start.o
-
 EMU_OBJS = \
 	$(OBJDIR)/beam_emu.o		$(OBJDIR)/beam_opcodes.o \
 	$(OBJDIR)/beam_load.o		$(OBJDIR)/beam_bif_load.o \
@@ -826,7 +819,6 @@ endif
 BASE_OBJS = $(RUN_OBJS) $(EMU_OBJS) $(OS_OBJS) $(EXTRA_BASE_OBJS)
 
 OBJS =	$(BASE_OBJS) $(DRV_OBJS)
-OBJS_SAE =  $(subst sys.o,sys_sae.o,$(OBJS))
 
 ELIB_C_FILES =	beam/elib_malloc.c \
 		beam/elib_memmove.c \
@@ -933,10 +925,6 @@ $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB): $(INIT_OBJS) $(OBJS_ELIB) $(DEPLIBS)
 	$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE_ELIB) \
 	$(LDFLAGS) $(DEXPORT) $(INIT_OBJS) $(OBJS_ELIB) $(LIBS)
 
-$(BINDIR)/$(EMULATOR_EXECUTABLE_SAE): $(INIT_OBJS_SAE) $(OBJS_SAE) $(DEPLIBS)
-	$(PURIFY) $(LD) -o $(BINDIR)/$(EMULATOR_EXECUTABLE_SAE) \
-	$(LDFLAGS) $(DEXPORT) $(INIT_OBJS_SAE) $(OBJS_SAE) $(LIBS)
-
 endif
 
 #
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 85bf584337..10cc2e9003 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -4143,54 +4143,6 @@ void erts_init_bif(void)
     await_proc_exit_trap = erts_export_put(am_erlang,am_await_proc_exit,3);
 }
 
-BIF_RETTYPE blocking_read_file_1(BIF_ALIST_1)
-{
-    Eterm bin;
-    Eterm* hp;
-    byte *buff;
-    int i, buff_size;
-    FILE *file;
-    struct stat file_info;
-    char *filename = NULL;
-    size_t size;
- 
-    i = list_length(BIF_ARG_1);
-    if (i < 0) {
-	BIF_ERROR(BIF_P, BADARG);
-    }
-    filename = erts_alloc(ERTS_ALC_T_TMP, i + 1);
-    if (intlist_to_buf(BIF_ARG_1, filename, i) != i)
-	erl_exit(1, "%s:%d: Internal error\n", __FILE__, __LINE__);
-    filename[i] = '\0';
- 
-    hp = HAlloc(BIF_P, 3);
- 
-    file = fopen(filename, "r");
-    if(file == NULL){
-	erts_free(ERTS_ALC_T_TMP, (void *) filename);
-	BIF_RET(TUPLE2(hp, am_error, am_nofile));
-    }
- 
-    stat(filename, &file_info);
-    erts_free(ERTS_ALC_T_TMP, (void *) filename);
-
-    buff_size = file_info.st_size;
-    buff = (byte *) erts_alloc_fnf(ERTS_ALC_T_TMP, buff_size);
-    if (!buff) {
-	fclose(file);
-	BIF_RET(TUPLE2(hp, am_error, am_allocator));
-    }
-    size = fread(buff, 1, buff_size, file);
-    fclose(file);
-    if (size < 0)
-	size = 0;
-    else if (size > buff_size)
-	size = (size_t) buff_size;
-    bin = new_binary(BIF_P, buff, (int) size);
-    erts_free(ERTS_ALC_T_TMP, (void *) buff);
- 
-    BIF_RET(TUPLE2(hp, am_ok, bin));
-}
 #ifdef HARDDEBUG
 /*
 You'll need this line in bif.tab to be able to use this debug bif
diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index 9feb302a3d..38e2dd77d3 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -686,8 +686,6 @@ bif 'erl.system.code':make_stub_module/3	ebif_code_make_stub_module_3
 bif code:is_module_native/1
 bif 'erl.system.code':is_native/1	ebif_code_is_native_1 code_is_module_native_1
 
-bif erlang:blocking_read_file/1
-
 #
 # New Bifs in R9C.
 #
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index f2e71ae98d..2ee802cf3e 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -336,59 +336,6 @@ init_shared_memory(int argc, char **argv)
 #endif
 }
 
-
-/*
- * Create the very first process.
- */
-
-void
-erts_first_process(Eterm modname, void* code, unsigned size, int argc, char** argv)
-{
-    int i;
-    Eterm args;
-    Eterm pid;
-    Eterm* hp;
-    Process parent;
-    Process* p;
-    ErlSpawnOpts so;
-    
-    if (erts_find_function(modname, am_start, 1) == NULL) {
-	char sbuf[256];
-	Atom* ap;
-
-	ap = atom_tab(atom_val(modname));
-	memcpy(sbuf, ap->name, ap->len);
-	sbuf[ap->len] = '\0';
-	erl_exit(5, "No function %s:start/1\n", sbuf);
-    }
-
-    /*
-     * We need a dummy parent process to be able to call erl_create_process().
-     */
-    erts_init_empty_process(&parent);
-    hp = HAlloc(&parent, argc*2 + 4);
-    args = NIL;
-    for (i = argc-1; i >= 0; i--) {
-	int len = sys_strlen(argv[i]);
-	args = CONS(hp, new_binary(&parent, (byte*)argv[i], len), args);
-	hp += 2;
-    }
-    args = CONS(hp, new_binary(&parent, code, size), args);
-    hp += 2;
-    args = CONS(hp, args, NIL);
-
-    so.flags = 0;
-    pid = erl_create_process(&parent, modname, am_start, args, &so);
-    p = process_tab[internal_pid_index(pid)];
-    p->group_leader = pid;
-
-    erts_cleanup_empty_process(&parent);
-}
-
-/*
- * XXX Old way of starting. Hopefully soon obsolete.
- */
-
 static void
 erl_first_process_otp(char* modname, void* code, unsigned size, int argc, char** argv)
 {
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index a7990e1799..7c3ba69a65 100644
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1720,7 +1720,6 @@ int erts_print_system_version(int to, void *arg, Process *c_p);
  * Interface to erl_init
  */
 void erl_init(void);
-void erts_first_process(Eterm modname, void* code, unsigned size, int argc, char** argv);
 
 #define seq_trace_output(token, msg, type, receiver, process) \
 seq_trace_output_generic((token), (msg), (type), (receiver), (process), NIL)
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index 0f20d36167..ca87d3d70f 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -648,7 +648,7 @@ extern char *erts_sys_ddll_error(int code);
 
 
 /*
- * System interfaces for startup/sae code (functions found in respective sys.c)
+ * System interfaces for startup.
  */
 
 
diff --git a/erts/emulator/sys/unix/erl9_start.c b/erts/emulator/sys/unix/erl9_start.c
deleted file mode 100644
index 578062d7e2..0000000000
--- a/erts/emulator/sys/unix/erl9_start.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * %CopyrightBegin%
- * 
- * Copyright Ericsson AB 2002-2009. All Rights Reserved.
- * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
- * 
- * %CopyrightEnd%
- */
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-#include "sys.h"
-#include "erl_vm.h"
-#include "global.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-/*
- * XXX This is a temporary dummy to make sys.c happy until we'll rewrite it.
- */
-unsigned preloaded_size_ring0 = 1;
-unsigned char preloaded_ring0[1] = {0};
-
-Preload pre_loaded[] = {
-    {"ring0", 1, preloaded_ring0},
-    {0, 0, 0}
-};
-
-int
-main(int argc, char** argv)
-{
-    char sbuf[1024];
-    struct {
-	void* p;
-	int sz;
-    } bins[2];
-    int bin_num = 0;
-    FILE* fp;
-    char* progname = argv[0];
-    char* eq;
-
-    argv++, argc--;
-
-    if (argc > 0 && argv[0][0] == '-') {
-	argv++, argc--;
-    }
-    if (argc < 1) {
-	abort();
-    }
-    if ((fp = fopen(argv[0], "r")) == NULL) {
-	abort();
-    }
-    
-    /* Needs to be called before any memory allocation */
-    erts_short_init();
-
-    while (fgets(sbuf, sizeof sbuf, fp)) {
-	if (sbuf[0] == '#') {
-	    continue;		/* Comment */
-	} else if (sbuf[0] == 'e' && strncmp("exec", sbuf, 4) == 0) {
-	    continue;		/* Comment ;-) */
-	} else if ((eq = strchr(sbuf, '=')) != NULL) {
-	    char* val;
-	    char* p = strchr(sbuf, '\n');
-	    if (p) {
-		*p = '\0';
-	    }
-	    *eq = '\0';
-	    val = erts_read_env(sbuf);
-	    if (val == NULL) {
-		*eq = '=';
-		erts_sys_putenv(sbuf, eq - &sbuf[0]);
-	    }
-	    erts_free_read_env(val);
-	} else if (sbuf[0] == ':' && '0' <= sbuf[1] && sbuf[1] <= '9') {
-	    int load_size = atoi(sbuf+1);
-	    void* bin;
-	    
-	    bin = malloc(load_size);
-	    if (fread(bin, 1, load_size, fp) != load_size) {
-		abort();
-	    }
-	    bins[bin_num].p = bin;
-	    bins[bin_num].sz = load_size;
-	    bin_num++;
-	} else if (strcmp(sbuf, "--end--\n") == 0) {
-	    int rval;
-	    Eterm mod = NIL;
-	    char *val;
-
-	    fclose(fp);
-
-	    if (bin_num != 2) {
-		abort();
-	    }
-
-	    val = erts_read_env("ERLBREAKHANDLER");
- 	    if (val) {
-		init_break_handler();
-	    }
-	    erts_free_read_env(val);
-
-	    if ((rval = erts_load_module(NULL, 0, NIL, &mod, bins[0].p, bins[0].sz)) < 0) {
-		fprintf(stderr, "%s: Load of initial module failed: %d\n",
-			progname, rval);
-		abort();
-	    }
-	    erts_first_process(mod, bins[1].p, bins[1].sz, argc, argv);
-	    free(bins[0].p);
-	    free(bins[1].p);
-	    process_main();
-	    abort();
-	} else {
-	    fprintf(stderr, "%s: bad line: %s\n", progname, sbuf);
-	    abort();
-	}
-    }
-    abort();
-}
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index 65719a91d6..d3921a14f8 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -3010,12 +3010,6 @@ erts_sys_pre_init(void)
     erts_sys_env_init();
 }
 
-/*
- * the last two only used for standalone erlang
- * they should are used by sae_main in beam dll to
- * enable standalone execution via erl_api-routines
- */
-
 void noinherit_std_handle(DWORD type)
 {
     HANDLE h = GetStdHandle(type);