From e7580bdbd1a84f53e78625c26d548025aeb585f0 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Fri, 15 Apr 2011 16:24:22 +0200
Subject: Add error code for cyclic symbolic links and make directory links
 readable

---
 erts/emulator/drivers/win32/win_efile.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/drivers/win32/win_efile.c b/erts/emulator/drivers/win32/win_efile.c
index 3d59564f7b..931bb196f1 100755
--- a/erts/emulator/drivers/win32/win_efile.c
+++ b/erts/emulator/drivers/win32/win_efile.c
@@ -127,6 +127,8 @@ static int errno_map(DWORD last_error) {
 	return EBUSY;
     case ERROR_NO_PROC_SLOTS:
 	return EAGAIN;
+    case ERROR_CANT_RESOLVE_FILENAME:
+	return EMLINK;
     case ERROR_ARENA_TRASHED:
     case ERROR_INVALID_BLOCK:
     case ERROR_BAD_ENVIRONMENT:
@@ -1405,7 +1407,7 @@ efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 	    DWORD fileAttributes =  GetFileAttributesW(wname);
 	    if ((fileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)) {
 		BOOLEAN success = 0;
-		HANDLE h = CreateFileW(wname, GENERIC_READ, 0,NULL, OPEN_EXISTING, 0, NULL);
+		HANDLE h = CreateFileW(wname, GENERIC_READ, 0,NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
 		int len;
 		if(h != INVALID_HANDLE_VALUE) {
 		    success = pGetFinalPathNameByHandle(h, wbuffer, size,0);
@@ -1421,7 +1423,7 @@ efile_readlink(Efile_error* errInfo, char* name, char* buffer, size_t size)
 			if (*wbuffer == L'\\')
 			    *wbuffer = L'/';
 		    CloseHandle(h);
-		}
+		} 
 		FreeLibrary(hModule);
 		if (success) {
 		    return 1;
-- 
cgit v1.2.3


From 41e6d95c4ca11598a5eb93901ce2fb0b758e9657 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 26 May 2011 15:29:30 +0200
Subject: Change start order so that service_event gets initialized before it's
 used

---
 erts/emulator/beam/erl_init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 0a57eb6d88..0173fd40f6 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -803,10 +803,12 @@ early_init(int *argc, char **argv) /*
 #if defined(HIPE)
     hipe_signal_init();	/* must be done very early */
 #endif
-    erl_sys_init();
 
     erl_sys_args(argc, argv);
 
+    /* Creates threads on Windows that depend on the arguments, so has to be after erl_sys_args */
+    erl_sys_init();
+
     erts_ets_realloc_always_moves = 0;
     erts_ets_always_compress = 0;
     erts_dist_buf_busy_limit = ERTS_DE_BUSY_LIMIT;
-- 
cgit v1.2.3


From f7da0d1019e3349c1ec9d55bd3a7d1948b92fc19 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Mon, 13 Jun 2011 14:24:23 +0200
Subject: Do not abort emulator when buggy pthread impl return EBUSY

---
 erts/emulator/beam/erl_threads.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_threads.h b/erts/emulator/beam/erl_threads.h
index 8c9cace0c5..a0eda61ba5 100644
--- a/erts/emulator/beam/erl_threads.h
+++ b/erts/emulator/beam/erl_threads.h
@@ -571,8 +571,9 @@ erts_mtx_destroy(erts_mtx_t *mtx)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy mutex");
+	    erts_thr_fatal_error(res, "destroy mutex");
     }
 #endif
 }
@@ -675,8 +676,9 @@ erts_cnd_destroy(erts_cnd_t *cnd)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy condition variable");
+	    erts_thr_fatal_error(res, "destroy condition variable");
     }
 #endif
 }
@@ -810,8 +812,9 @@ erts_rwmtx_destroy(erts_rwmtx_t *rwmtx)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwmutex");
+	    erts_thr_fatal_error(res, "destroy rwmutex");
     }
 #endif
 }
@@ -1496,8 +1499,9 @@ erts_spinlock_destroy(erts_spinlock_t *lock)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwlock");
+	    erts_thr_fatal_error(res, "destroy rwlock");
     }
 #else
     (void)lock;
@@ -1614,8 +1618,9 @@ erts_rwlock_destroy(erts_rwlock_t *lock)
 		"Most likely a bug in pthread implementation.";
 	    erts_send_warning_to_logger_str_nogl(warn);
 	}
+	else
 #endif
-	erts_thr_fatal_error(res, "destroy rwlock");
+	    erts_thr_fatal_error(res, "destroy rwlock");
     }
 #else
     (void)lock;
-- 
cgit v1.2.3


From 4f66e1a8f193c41d7de62011afde4803ba8f09f1 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Wed, 15 Jun 2011 14:46:07 +0200
Subject: Move erts_sys_env_init() to erts_sys_pre_init()

---
 erts/emulator/sys/win32/sys.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index a2159d063c..76db355a9c 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -3282,6 +3282,7 @@ erts_sys_pre_init(void)
     }
 #endif
     erts_smp_atomic_init(&sys_misc_mem_sz, 0);
+    erts_sys_env_init();
 }
 
 void noinherit_std_handle(DWORD type)
@@ -3297,8 +3298,6 @@ void erl_sys_init(void)
 {
     HANDLE handle;
 
-    erts_sys_env_init();
-
     noinherit_std_handle(STD_OUTPUT_HANDLE);
     noinherit_std_handle(STD_INPUT_HANDLE);
     noinherit_std_handle(STD_ERROR_HANDLE);
-- 
cgit v1.2.3


From 604967b4c184249d8604f327bb4e683e2c453de8 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 6 Jul 2011 16:58:04 +0200
Subject: Move init of smp rw mutex from init to sys_args to make sure that it
 is initialized before the first erts_sys_getenv call

---
 erts/emulator/sys/unix/sys.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index bafbbb0f6c..cc08c1d20a 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -527,7 +527,6 @@ erts_sys_pre_init(void)
 void
 erl_sys_init(void)
 {
-    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
 #if !DISABLE_VFORK
  {
     int res;
@@ -3088,6 +3087,8 @@ get_value(char* rest, char** argv, int* ip)
 void
 erl_sys_args(int* argc, char** argv)
 {
+    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
+
     int i, j;
 
     i = 1;
@@ -3151,4 +3152,5 @@ erl_sys_args(int* argc, char** argv)
 	    argv[j++] = argv[i];
     }
     *argc = j;
+
 }
-- 
cgit v1.2.3


From 1b2cea397131a36a39b18c6ce8c6944bf11db4c7 Mon Sep 17 00:00:00 2001
From: Filipe David Manana <fdmanana@apache.org>
Date: Mon, 16 May 2011 17:00:25 +0100
Subject: Add erlang:external_size/2 BIF

This BIF's second parameter is a list of options.
Currently the only allowed option is {minor_version, Version}
where version is either 0 (default) or 1.
---
 erts/emulator/beam/bif.tab          |  2 ++
 erts/emulator/beam/external.c       | 49 +++++++++++++++++++++++++++++++++++++
 erts/emulator/beam/external.h       |  1 +
 erts/emulator/test/binary_SUITE.erl | 16 ++++++++++--
 4 files changed, 66 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/bif.tab b/erts/emulator/beam/bif.tab
index b171e99e03..831c0b1ce6 100644
--- a/erts/emulator/beam/bif.tab
+++ b/erts/emulator/beam/bif.tab
@@ -87,6 +87,8 @@ bif erlang:exit/2
 bif 'erl.lang.proc':signal/2		ebif_signal_2 exit_2
 bif erlang:external_size/1
 bif 'erl.lang.term':external_size/1	ebif_external_size_1
+bif erlang:external_size/2
+bif 'erl.lang.term':external_size/2	ebif_external_size_2
 ubif erlang:float/1
 ubif 'erl.lang.number':to_float/1	ebif_to_float_1 float_1
 bif erlang:float_to_list/1
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index 1a102f7187..6953e7fe7d 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -459,6 +459,12 @@ Uint erts_encode_ext_size(Eterm term)
 	+ 1 /* VERSION_MAGIC */;
 }
 
+Uint erts_encode_ext_size_2(Eterm term, unsigned dflags)
+{
+    return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS|dflags)
+        + 1 /* VERSION_MAGIC */;
+}
+
 Uint erts_encode_ext_size_ets(Eterm term)
 {
     return encode_size_struct2(NULL, term, TERM_TO_BINARY_DFLAGS|DFLAGS_INTERNAL_TAGS);
@@ -1261,6 +1267,49 @@ external_size_1(Process* p, Eterm Term)
     }
 }
 
+Eterm
+external_size_2(Process* p, Eterm Term, Eterm Flags)
+{
+    Uint size;
+    Uint flags = TERM_TO_BINARY_DFLAGS;
+
+    while (is_list(Flags)) {
+        Eterm arg = CAR(list_val(Flags));
+        Eterm* tp;
+
+        if (is_tuple(arg) && *(tp = tuple_val(arg)) == make_arityval(2)) {
+            if (tp[1] == am_minor_version && is_small(tp[2])) {
+                switch (signed_val(tp[2])) {
+                case 0:
+                    break;
+                case 1:
+                    flags |= DFLAG_NEW_FLOATS;
+                    break;
+                default:
+                    goto error;
+                }
+            } else {
+                goto error;
+            }
+        } else {
+        error:
+            BIF_ERROR(p, BADARG);
+        }
+        Flags = CDR(list_val(Flags));
+    }
+    if (is_not_nil(Flags)) {
+        goto error;
+    }
+
+    size = erts_encode_ext_size_2(Term, flags);
+    if (IS_USMALL(0, size)) {
+        BIF_RET(make_small(size));
+    } else {
+        Eterm* hp = HAlloc(p, BIG_UINT_HEAP_SIZE);
+        BIF_RET(uint_to_big(size, hp));
+    }
+}
+
 Eterm
 erts_term_to_binary(Process* p, Eterm Term, int level, Uint flags)
 {
diff --git a/erts/emulator/beam/external.h b/erts/emulator/beam/external.h
index d8287b96a4..72fe74baf2 100644
--- a/erts/emulator/beam/external.h
+++ b/erts/emulator/beam/external.h
@@ -160,6 +160,7 @@ Uint erts_encode_dist_ext_size(Eterm, Uint32, ErtsAtomCacheMap *);
 void erts_encode_dist_ext(Eterm, byte **, Uint32, ErtsAtomCacheMap *);
 
 Uint erts_encode_ext_size(Eterm);
+Uint erts_encode_ext_size_2(Eterm, unsigned);
 Uint erts_encode_ext_size_ets(Eterm);
 void erts_encode_ext(Eterm, byte **);
 byte* erts_encode_ext_ets(Eterm, byte *, struct erl_off_heap_header** ext_off_heap);
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl
index 4e82381fba..fed5854112 100644
--- a/erts/emulator/test/binary_SUITE.erl
+++ b/erts/emulator/test/binary_SUITE.erl
@@ -478,6 +478,11 @@ terms(Config) when is_list(Config) ->
 			  Sz when is_integer(Sz), size(Bin) =< Sz ->
 			      ok
 		      end,
+              Bin1 = term_to_binary(Term, [{minor_version, 1}]),
+              case erlang:external_size(Bin1, [{minor_version, 1}]) of
+              Sz1 when is_integer(Sz1), size(Bin1) =< Sz1 ->
+                  ok
+              end,
 		      Term = binary_to_term(Bin),
 		      Term = binary_to_term(Bin, [safe]),
 		      Unaligned = make_unaligned_sub_binary(Bin),
@@ -510,7 +515,12 @@ terms_float(Config) when is_list(Config) ->
 			      Term = binary_to_term(Bin0),
 			      Bin1 = term_to_binary(Term, [{minor_version,1}]),
 			      Term = binary_to_term(Bin1),
-			      true = size(Bin1) < size(Bin0)
+			      true = size(Bin1) < size(Bin0),
+                  Size0 = erlang:external_size(Term),
+                  Size00 = erlang:external_size(Term, [{minor_version, 0}]),
+                  Size1 = erlang:external_size(Term, [{minor_version, 1}]),
+                  true = (Size0 =:= Size00),
+                  true = Size1 < Size0
 		      end).
 
 external_size(Config) when is_list(Config) ->
@@ -526,7 +536,9 @@ external_size(Config) when is_list(Config) ->
 	    io:format("  Aligned size: ~p\n", [Sz1]),
 	    io:format("Unaligned size: ~p\n", [Sz2]),
 	    ?line ?t:fail()
-    end.
+    end,
+    ?line erlang:external_size(Bin) =:= erlang:external_size(Bin, [{minor_version, 1}]),
+    ?line erlang:external_size(Unaligned) =:= erlang:external_size(Unaligned, [{minor_version, 1}]).
 
 external_size_1(Term, Size0, Limit) when Size0 < Limit ->
     case erlang:external_size(Term) of
-- 
cgit v1.2.3


From 03d8c2877342d5ed57596330a61ec0374092f136 Mon Sep 17 00:00:00 2001
From: Filipe David Manana <fdmanana@apache.org>
Date: Thu, 1 Sep 2011 02:05:05 +0100
Subject: Fix enif_compare on 64bits machines

In 64bits machines the Sint type has a size of 8 bytes,
while on 32bits machines it has a 4 bytes size.
enif_compare was ignoring this and therefore returning
incorrect values when the result of the CMP function
(which returns a Sint value) doesn't fit in 4 bytes.

For example, passing the operands -1294536544000 and
-1178704800000 to enif_compare would trigger the bug.
---
 erts/emulator/beam/erl_nif.c     | 10 +++++++++-
 erts/emulator/test/nif_SUITE.erl |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index d9b1a8e89d..6e7ac43676 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -578,7 +578,15 @@ int enif_is_identical(Eterm lhs, Eterm rhs)
 
 int enif_compare(Eterm lhs, Eterm rhs)
 {
-    return CMP(lhs,rhs);
+    Sint result = CMP(lhs,rhs);
+
+    if (result < 0) {
+        return -1;
+    } else if (result > 0) {
+        return 1;
+    }
+
+    return result;
 }
 
 int enif_get_tuple(ErlNifEnv* env, Eterm tpl, int* arity, const Eterm** array)
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 2867e8e2e4..f6344791f1 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -281,6 +281,12 @@ types(Config) when is_list(Config) ->
 		  end, int_list()),
 
     ?line verify_tmpmem(TmpMem),
+    ?line true = (compare(-1294536544000, -1178704800000) < 0),
+    ?line true = (compare(-1178704800000, -1294536544000) > 0),
+    ?line true = (compare(-295147905179352825856, -36893488147419103232) < 0),
+    ?line true = (compare(-36893488147419103232, -295147905179352825856) > 0),
+    ?line true = (compare(-29514790517935282585612345678, -36893488147419103232) < 0),
+    ?line true = (compare(-36893488147419103232, -29514790517935282585612345678) > 0),
     ok.
 
 int_list() ->
-- 
cgit v1.2.3


From 9dda912e8d10ca98ced3fc79cf89f2e95a8a2382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 29 Sep 2010 16:08:59 +0200
Subject: BEAM: Unify allocation of X and float registers

In the half-word emulator, smp emulator, and non-smp emulator
the X register and float register arrays were allocated in
different ways.

Always allocate the registers and store the pointers to the
allocated register arrays in the scheduler data.
---
 erts/emulator/beam/beam_emu.c         | 37 +++++------------------------------
 erts/emulator/beam/erl_process.c      | 11 +++++++----
 erts/emulator/beam/erl_process.h      | 12 ++++--------
 erts/emulator/hipe/hipe_mode_switch.c |  2 +-
 4 files changed, 17 insertions(+), 45 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c
index afdbd65bb5..4b5b5cbdaa 100644
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
@@ -1145,26 +1145,11 @@ void process_main(void)
     Eterm *tmp_big;		/* Temporary buffer for small bignums if !HEAP_ON_C_STACK. */
 #endif
 
-#ifndef ERTS_SMP
-#if !HALFWORD_HEAP
-    static Eterm save_reg[ERTS_X_REGS_ALLOCATED];
-    /* X registers -- not used directly, but
-     * through 'reg', because using it directly
-     * needs two instructions on a SPARC,
-     * while using it through reg needs only
-     * one.
-     */
-#endif
     /*
-     * Floating point registers.
-     */
-    static FloatDef freg[MAX_REG];
-#else
-    /* X regisers and floating point registers are located in
+     * X registers and floating point registers are located in
      * scheduler specific data.
      */
     register FloatDef *freg;
-#endif
 
     /*
      * For keeping the negative old value of 'reds' when call saving is active.
@@ -1201,14 +1186,6 @@ void process_main(void)
 	init_done = 1;
 	goto init_emulator;
     }
-#ifndef ERTS_SMP
-#if !HALFWORD_HEAP
-    reg = save_reg;	/* XXX: probably wastes a register on x86 */
-#else
-    /* Registers need to be heap allocated (correct memory range) for tracing to work */
-    reg = erts_alloc(ERTS_ALC_T_BEAM_REGISTER, ERTS_X_REGS_ALLOCATED * sizeof(Eterm));
-#endif
-#endif
     c_p = NULL;
     reds_used = 0;
     goto do_schedule1;
@@ -1229,10 +1206,8 @@ void process_main(void)
 #endif
     ERTS_SMP_REQ_PROC_MAIN_LOCK(c_p);
     PROCESS_MAIN_CHK_LOCKS(c_p);
-#ifdef ERTS_SMP
-    reg = c_p->scheduler_data->save_reg;
-    freg = c_p->scheduler_data->freg;
-#endif
+    reg = ERTS_PROC_GET_SCHDATA(c_p)->x_reg_array;
+    freg = ERTS_PROC_GET_SCHDATA(c_p)->f_reg_array;
 #if !HEAP_ON_C_STACK
     tmp_big = ERTS_PROC_GET_SCHDATA(c_p)->beam_emu_tmp_heap;
 #endif
@@ -5151,10 +5126,8 @@ void process_main(void)
      c_p->def_arg_reg[4] = -neg_o_reds;
      reg[0] = r(0);
      c_p = hipe_mode_switch(c_p, cmd, reg);
-#ifdef ERTS_SMP
-     reg = c_p->scheduler_data->save_reg;
-     freg = c_p->scheduler_data->freg;
-#endif
+     reg = ERTS_PROC_GET_SCHDATA(c_p)->x_reg_array;
+     freg = ERTS_PROC_GET_SCHDATA(c_p)->f_reg_array;
      ERL_BITS_RELOAD_STATEP(c_p);
      neg_o_reds = -c_p->def_arg_reg[4];
      FCALLS = c_p->fcalls;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index bbdcf79d00..3a6fe5784a 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -2723,11 +2723,14 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online)
 	esdp->match_pseudo_process = NULL;
 	esdp->ssi = ERTS_SCHED_SLEEP_INFO_IX(ix);
 	esdp->free_process = NULL;
-#if HALFWORD_HEAP
-	/* Registers need to be heap allocated (correct memory range) for tracing to work */
-	esdp->save_reg = erts_alloc(ERTS_ALC_T_BEAM_REGISTER, ERTS_X_REGS_ALLOCATED * sizeof(Eterm));
-#endif
 #endif
+	esdp->x_reg_array =
+	    erts_alloc_permanent_cache_aligned(ERTS_ALC_T_BEAM_REGISTER,
+					       ERTS_X_REGS_ALLOCATED *
+					       sizeof(Eterm));
+	esdp->f_reg_array =
+	    erts_alloc_permanent_cache_aligned(ERTS_ALC_T_BEAM_REGISTER,
+					       MAX_REG * sizeof(FloatDef));
 #if !HEAP_ON_C_STACK
 	esdp->num_tmp_heap_used = 0;
 #endif
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h
index 739aef3130..627f10b142 100644
--- a/erts/emulator/beam/erl_process.h
+++ b/erts/emulator/beam/erl_process.h
@@ -387,19 +387,15 @@ do {								\
 } while (0)
 
 struct ErtsSchedulerData_ {
-
-#ifdef ERTS_SMP
     /*
      * Keep X registers first (so we get as many low
      * numbered registers as possible in the same cache
      * line).
      */
-#if !HALFWORD_HEAP
-    Eterm save_reg[ERTS_X_REGS_ALLOCATED]; /* X registers */
-#else
-    Eterm *save_reg;
-#endif
-    FloatDef freg[MAX_REG];	/* Floating point registers. */
+    Eterm* x_reg_array;		/* X registers */
+    FloatDef* f_reg_array;	/* Floating point registers. */
+
+#ifdef ERTS_SMP
     ethr_tid tid;		/* Thread id */
     struct erl_bits_state erl_bits_state; /* erl_bits.c state */
     void *match_pseudo_process; /* erl_db_util.c:db_prog_match() */
diff --git a/erts/emulator/hipe/hipe_mode_switch.c b/erts/emulator/hipe/hipe_mode_switch.c
index 0b35dbdf04..e5b8cf8a19 100644
--- a/erts/emulator/hipe/hipe_mode_switch.c
+++ b/erts/emulator/hipe/hipe_mode_switch.c
@@ -473,7 +473,7 @@ Process *hipe_mode_switch(Process *p, unsigned cmd, Eterm reg[])
 	      p = schedule(p, reds_in - p->fcalls);
 #ifdef ERTS_SMP
 	      p->hipe_smp.have_receive_locks = 0;
-	      reg = p->scheduler_data->save_reg;
+	      reg = p->scheduler_data->x_reg_array;
 #endif
 	  }
 	  {
-- 
cgit v1.2.3


From ef757a19bdab06e29dcc29de32ef7b8202f2e68d Mon Sep 17 00:00:00 2001
From: Christian von Roques <roques@mti.ag>
Date: Mon, 8 Aug 2011 16:33:05 +0200
Subject: Changes inspired by running cppcheck(1)

---
 erts/emulator/sys/common/erl_poll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index f5c785d683..7278075f54 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -405,7 +405,7 @@ woke_up(ErtsPollSet ps)
 static ERTS_INLINE void
 wake_poller(ErtsPollSet ps, int interrupted)
 {
-    int wake;
+    int wake = 0;
 #ifdef ERTS_SMP
     erts_aint32_t wakeup_state;
     if (!interrupted)
-- 
cgit v1.2.3


From 1cc98829ed8649e585556cd009495522e42f21da Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 1 Sep 2011 14:10:55 +0200
Subject: Cleanup ETS bif's in hipe:erl_bif_types.erl (for dialyzer)

---
 erts/emulator/beam/erl_db.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_db.c b/erts/emulator/beam/erl_db.c
index eb50f56502..e9bdeb35ef 100644
--- a/erts/emulator/beam/erl_db.c
+++ b/erts/emulator/beam/erl_db.c
@@ -3658,9 +3658,6 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    ret = am_true;
 	else
 	    ret = am_false;
-    } else if (What == am_atom_put("kept_objects",12)) {
-	ret = make_small(IS_HASH_TABLE(tb->common.status)
-			 ? db_kept_items_hash(&tb->hash) : 0);
     } else if (What == am_atom_put("safe_fixed",10)) {
 #ifdef ERTS_SMP
 	erts_smp_mtx_lock(&tb->common.fixlock);
@@ -3702,7 +3699,7 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    Eterm* hp;
 
 	    db_calc_stats_hash(&tb->hash, &stats);
-	    hp = HAlloc(p, 1 + 6 + FLOAT_SIZE_OBJECT*3);
+	    hp = HAlloc(p, 1 + 7 + FLOAT_SIZE_OBJECT*3);
 	    f.fd = stats.avg_chain_len;
 	    avg = make_float(hp);
 	    PUT_DOUBLE(f, hp);
@@ -3717,10 +3714,11 @@ static Eterm table_info(Process* p, DbTable* tb, Eterm What)
 	    std_dev_exp = make_float(hp);
 	    PUT_DOUBLE(f, hp);
 	    hp += FLOAT_SIZE_OBJECT;
-	    ret = TUPLE6(hp, make_small(erts_smp_atomic_read(&tb->hash.nactive)),
+	    ret = TUPLE7(hp, make_small(erts_smp_atomic_read(&tb->hash.nactive)),
 			 avg, std_dev_real, std_dev_exp,
 			 make_small(stats.min_chain_len),
-			 make_small(stats.max_chain_len));
+			 make_small(stats.max_chain_len),
+			 make_small(db_kept_items_hash(&tb->hash)));
 	}
 	else {
 	    ret = am_false;
-- 
cgit v1.2.3


From 8d89620380fc8cff66ac6bab3e781058191ce0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Mon, 12 Sep 2011 16:38:59 +0200
Subject: Make sure we have a run_queue

* In rare cases we could have no run_queue in schedule misc ops
---
 erts/emulator/beam/erl_process.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 2704359a8f..d8aed63544 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -5782,10 +5782,13 @@ erts_sched_stat_term(Process *p, int total)
 void
 erts_schedule_misc_op(void (*func)(void *), void *arg)
 {
-    ErtsRunQueue *rq = erts_get_runq_current(NULL);
+    ErtsRunQueue *rq;
     ErtsMiscOpList *molp = misc_op_list_alloc();
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
 
-    if (!rq) {
+    if (esdp) {
+	rq = esdp->run_queue;
+    } else {
 	/*
 	 * This can only happen when the sys msg dispatcher
 	 * thread schedules misc ops (this happens *very*
-- 
cgit v1.2.3


From 90f703bafc69bf2446db718fd681c26c2bef7f10 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Wed, 31 Aug 2011 15:04:36 +0200
Subject: Fix misspelling of successful

---
 erts/emulator/drivers/common/inet_drv.c | 2 +-
 erts/emulator/sys/win32/sys.c           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index ebc4469a23..743c01d935 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -7012,7 +7012,7 @@ static int sctp_fill_opts(inet_descriptor* desc, char* buf, int buflen,
 	default:
 	    RETURN_ERROR(spec, -EINVAL); /* No more valid options */
 	}
-	/* If we get here one result has been succesfully loaded */
+	/* If we get here one result has been successfully loaded */
 	length ++;
     }
     if (buflen != 0) RETURN_ERROR(spec, -EINVAL); /* Optparam mismatch */
diff --git a/erts/emulator/sys/win32/sys.c b/erts/emulator/sys/win32/sys.c
index a2159d063c..f2d2933559 100644
--- a/erts/emulator/sys/win32/sys.c
+++ b/erts/emulator/sys/win32/sys.c
@@ -2771,7 +2771,7 @@ ready_output(ErlDrvData drv_data, ErlDrvEvent ready_event)
     DEBUGF(("ready_output(%d, 0x%x)\n", drv_data, ready_event));
     set_busy_port(dp->port_num, 0);
     if (!(dp->outbuf)) {
-	/* Happens because event sometimes get signalled during a succesful
+	/* Happens because event sometimes get signalled during a successful
 	   write... */
 	return;
     }
-- 
cgit v1.2.3


From dfbbdaab2744e55c0efc42cd4b1b7542a65b33f1 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Wed, 31 Aug 2011 15:23:51 +0200
Subject: Fix misspelling of exceed

---
 erts/emulator/test/driver_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl
index f6cf01ce16..a77ea4f3be 100644
--- a/erts/emulator/test/driver_SUITE.erl
+++ b/erts/emulator/test/driver_SUITE.erl
@@ -1590,7 +1590,7 @@ otp_6879(Config) when is_list(Config) ->
 				      end
 			end,
 			Procs),
-    %% Also try it when input exeeds default buffer (256 bytes)
+    %% Also try it when input exceeds default buffer (256 bytes)
     ?line Data = lists:seq(1, 1000),
     ?line case open_port({spawn, Drv}, []) of
 	      Port when is_port(Port) ->
-- 
cgit v1.2.3


From 65c9f41425a1c5e09338de08ed41cd1704f8a920 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Wed, 31 Aug 2011 15:29:42 +0200
Subject: Fix misspelling of accommodate

---
 erts/emulator/test/distribution_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/test/distribution_SUITE.erl b/erts/emulator/test/distribution_SUITE.erl
index 4bebae51cc..e4af5c00a6 100644
--- a/erts/emulator/test/distribution_SUITE.erl
+++ b/erts/emulator/test/distribution_SUITE.erl
@@ -173,7 +173,7 @@ bulk_sendsend(Terms, BinSize) ->
     Ratio = if MonitorCount2 == 0 -> MonitorCount1 / 1.0;
                true               -> MonitorCount1 / MonitorCount2
             end,
-    %% A somewhat arbitrary ratio, but hopefully one that will accomodate
+    %% A somewhat arbitrary ratio, but hopefully one that will accommodate
     %% a wide range of CPU speeds.
     true = (Ratio > 8.0),
     {comment,
-- 
cgit v1.2.3


From c59dc075b6306e38d7b4bd52d29cfd4d144756cb Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Wed, 31 Aug 2011 16:08:27 +0200
Subject: Fix more misspellings of compatibility

---
 erts/emulator/beam/erl_bif_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c
index 0509e51a6f..fbd8757751 100644
--- a/erts/emulator/beam/erl_bif_trace.c
+++ b/erts/emulator/beam/erl_bif_trace.c
@@ -679,7 +679,7 @@ trace_3(Process* p, Eterm pid_spec, Eterm how, Eterm list)
 		    } else if (tracer != NIL) {
 			tracee_port->tracer_proc = tracer;
 		    }
-		    /* matches are not counted for ports since it would violate compability */	
+		    /* matches are not counted for ports since it would violate compatibility */
 		    /* This could be a reason to modify this function or make a new one. */
 		}
 	    }
-- 
cgit v1.2.3


From a27dbff4ba4313b28bdfa132d6120e4b71d5986d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Fri, 16 Sep 2011 16:00:30 +0200
Subject: erts: Remove compiler warning in sys.c

---
 erts/emulator/sys/unix/sys.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index cc08c1d20a..e5ee0df7fa 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -3087,10 +3087,10 @@ get_value(char* rest, char** argv, int* ip)
 void
 erl_sys_args(int* argc, char** argv)
 {
-    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
-
     int i, j;
 
+    erts_smp_rwmtx_init(&environ_rwmtx, "environ");
+
     i = 1;
 
     ASSERT(argc && argv);
-- 
cgit v1.2.3


From dd24ca1cb76de9973220fed356540f190a05ac83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 30 Aug 2011 17:01:14 +0200
Subject: Fix build problems on MacOS 10.7 (Lion)

On MacOS 10.7 (Lion) with Xcode 4.1 installed, the default
C compiler is llvm-gcc-4.2. That compiler compiles beam_emu.c
incorrectly, resulting in an emulator that will not start.

The problem can be worked around by turning off all optimizations,
but that will significantly degrade the performance of the run-time
system. The problem can also be worked around manually like this:

  CC=gcc-4.2 ./configure

To allow a working system to be built "out of the box", have
the configure script set up the emulator Makefile so that gcc-4.2
will be used to compile beam_emu.c if the default compiler is
llvm-based. All other C files will still be compiled with the
default compiler.
---
 erts/emulator/Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index b658e79378..620402fbfb 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -598,11 +598,6 @@ INCLUDES += -I$(ERL_TOP)/erts/etc/vxworks
 endif
 
 ifeq ($(TARGET),win32)
-# Usually the same as the default rule, but certain platforms (i.e. win32) mix
-# different compilers
-$(OBJDIR)/beam_emu.o: beam/beam_emu.c
-	$(EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
-
 $(OBJDIR)/dll_sys.o: sys/$(ERLANG_OSTYPE)/sys.c
 	$(CC) $(CFLAGS) -DERL_RUN_SHARED_LIB=1 $(INCLUDES) -c $< -o $@
 
@@ -616,6 +611,11 @@ $(OBJDIR)/beam_emu.o: beam/beam_emu.c
 	$(CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) \
          -OPT:Olimit=0 -WOPT:lpre=off:spre=off:epre=off \
          $(INCLUDES) -c $< -o $@
+else
+# Usually the same as the default rule, but certain platforms (e.g. win32) mix
+# different compilers
+$(OBJDIR)/beam_emu.o: beam/beam_emu.c
+	$(EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 endif
 
 
-- 
cgit v1.2.3