Merge branch 'sverker/erl_interface-32intfix/OTP-8945' into dev

* sverker/erl_interface-32intfix/OTP-8945:
  Fix ei_decode_SUITE:test_ei_decode_long for halfword vm
  erl_interface: Fix erl_term_len for integers and refs

2 files changed, 19 insertions, 3 deletions

diff --git a/lib/erl_interface/test/ei_decode_SUITE.erl b/lib/erl_interface/test/ei_decode_SUITE.erl
index 09a37409f2..524a04a3b4 100644
--- a/lib/erl_interface/test/ei_decode_SUITE.erl
+++ b/lib/erl_interface/test/ei_decode_SUITE.erl
@@ -232,7 +232,7 @@ send_integers(P) ->
     ?line send_term_as_binary(P, 16#80000000),  % SMALL_BIG_EXT new smallest pos(*)
     ?line send_term_as_binary(P,-16#80000001),	% SMALL_BIG_EXT new largest neg (*)
  
-    case erlang:system_info(wordsize) of
+    case erlang:system_info({wordsize,external}) of
 	4 ->	 
           ?line send_term_as_binary(P, 16#80000000),% SMALL_BIG_EXT u32
           ?line send_term_as_binary(P, 16#ffffffff),% SMALL_BIG_EXT largest u32
diff --git a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
index f273efd532..80d7f69520 100644
--- a/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
+++ b/lib/erl_interface/test/erl_eterm_SUITE_data/eterm_test.c
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2010. 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
@@ -98,14 +98,30 @@ static void encode_decode(ETERM* original, const char* text)
 {
     static unsigned char encoded[16*1024];
     ETERM* new_terms;
-    int bytes = erl_encode(original, encoded);
+    ETERM* head;
+    int bytes;
+    int len;
+
+    /* If a list, check the elements one by one first */
+    head = erl_hd(original);
+    if (head != NULL) {
+	encode_decode(head, "CAR");
+	encode_decode(erl_tl(original), "CDR");
+    }
 
+    bytes = erl_encode(original, encoded);
     if (bytes == 0) {
 	fail("failed to encode terms");
     } 
     else if (bytes > sizeof(encoded)) {
 	fail("encoded terms buffer overflow");
     }
+    else if (bytes != (len=erl_term_len(original))) {
+	fprintf(stderr, "bytes(%d) != len(%d) for term ", bytes, len);
+	erl_print_term(stderr, original);
+	fprintf(stderr, " [%s]\r\n", text);
+	fail("erl_encode and erl_term_len do not agree");
+    }
     else if ((new_terms = erl_decode(encoded)) == NULL) {
 	fail("failed to decode terms");
     }