Merge branch 'sverk/win64-fixes' into maint

* sverk/win64-fixes:
  erts: Change some more 'long' to pointer sized int (ErlDrvUInt)
  erts: Fix crash in nif_SUITE for win64
  erts: Fix assert in isdigit for negative characters

11 files changed, 70 insertions, 73 deletions

diff --git a/erts/emulator/beam/erl_afit_alloc.c b/erts/emulator/beam/erl_afit_alloc.c
index 5850f80843..b45201af42 100644
--- a/erts/emulator/beam/erl_afit_alloc.c
+++ b/erts/emulator/beam/erl_afit_alloc.c
@@ -259,10 +259,10 @@ info_options(Allctr_t *allctr,
  * to erts_afalc_test()                                                      *
 \*                                                                           */
 
-unsigned long
-erts_afalc_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_afalc_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }
diff --git a/erts/emulator/beam/erl_afit_alloc.h b/erts/emulator/beam/erl_afit_alloc.h
index cf7b99c463..b90ac8f7c5 100644
--- a/erts/emulator/beam/erl_afit_alloc.h
+++ b/erts/emulator/beam/erl_afit_alloc.h
@@ -56,7 +56,7 @@ struct AFAllctr_t_ {
     AFFreeBlock_t *	free_list;
 };
 
-unsigned long erts_afalc_test(unsigned long, unsigned long, unsigned long);
+UWord erts_afalc_test(UWord, UWord, UWord);
 
 #endif /* #if defined(GET_ERL_AF_ALLOC_IMPL)
 	      && !defined(ERL_AF_ALLOC_IMPL__) */
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index c19a2647e4..9de4ef1ff9 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -3219,10 +3219,7 @@ void *safe_realloc(void *ptr, Uint sz)
 \*                                                                           */
 #define ERTS_ALC_TEST_ABORT erl_exit(ERTS_ABORT_EXIT, "%s:%d: Internal error\n")
 
-UWord erts_alc_test(UWord op,
-			    UWord a1,
-			    UWord a2,
-			    UWord a3)
+UWord erts_alc_test(UWord op, UWord a1, UWord a2, UWord a3)
 {
     switch (op >> 8) {
     case 0x0:	return erts_alcu_test(op,  a1, a2);
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index cbeb2c1e3a..53062979a6 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -4405,42 +4405,42 @@ erts_alcu_init(AlcUInit_t *init)
  * to erts_alcu_test()                                                       *
 \*                                                                           */
 
-unsigned long
-erts_alcu_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_alcu_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x000:	return (unsigned long) BLK_SZ((Block_t *) a1);
-    case 0x001:	return (unsigned long) BLK_UMEM_SZ((Block_t *) a1);
-    case 0x002:	return (unsigned long) IS_PREV_BLK_FREE((Block_t *) a1);
-    case 0x003:	return (unsigned long) IS_FREE_BLK((Block_t *) a1);
-    case 0x004:	return (unsigned long) IS_LAST_BLK((Block_t *) a1);
-    case 0x005:	return (unsigned long) UMEM2BLK((void *) a1);
-    case 0x006:	return (unsigned long) BLK2UMEM((Block_t *) a1);
-    case 0x007:	return (unsigned long) IS_SB_CARRIER((Carrier_t *) a1);
-    case 0x008:	return (unsigned long) IS_SBC_BLK((Block_t *) a1);
-    case 0x009:	return (unsigned long) IS_MB_CARRIER((Carrier_t *) a1);
-    case 0x00a:	return (unsigned long) IS_MSEG_CARRIER((Carrier_t *) a1);
-    case 0x00b:	return (unsigned long) CARRIER_SZ((Carrier_t *) a1);
-    case 0x00c:	return (unsigned long) SBC2BLK((Allctr_t *) a1,
+    case 0x000:	return (UWord) BLK_SZ((Block_t *) a1);
+    case 0x001:	return (UWord) BLK_UMEM_SZ((Block_t *) a1);
+    case 0x002:	return (UWord) IS_PREV_BLK_FREE((Block_t *) a1);
+    case 0x003:	return (UWord) IS_FREE_BLK((Block_t *) a1);
+    case 0x004:	return (UWord) IS_LAST_BLK((Block_t *) a1);
+    case 0x005:	return (UWord) UMEM2BLK((void *) a1);
+    case 0x006:	return (UWord) BLK2UMEM((Block_t *) a1);
+    case 0x007:	return (UWord) IS_SB_CARRIER((Carrier_t *) a1);
+    case 0x008:	return (UWord) IS_SBC_BLK((Block_t *) a1);
+    case 0x009:	return (UWord) IS_MB_CARRIER((Carrier_t *) a1);
+    case 0x00a:	return (UWord) IS_MSEG_CARRIER((Carrier_t *) a1);
+    case 0x00b:	return (UWord) CARRIER_SZ((Carrier_t *) a1);
+    case 0x00c:	return (UWord) SBC2BLK((Allctr_t *) a1,
 					       (Carrier_t *) a2);
-    case 0x00d:	return (unsigned long) BLK_TO_SBC((Block_t *) a2);
-    case 0x00e:	return (unsigned long) MBC_TO_FIRST_BLK((Allctr_t *) a1,
+    case 0x00d:	return (UWord) BLK_TO_SBC((Block_t *) a2);
+    case 0x00e:	return (UWord) MBC_TO_FIRST_BLK((Allctr_t *) a1,
 						(Carrier_t *) a2);
-    case 0x00f:	return (unsigned long) FIRST_BLK_TO_MBC((Allctr_t *) a1,
+    case 0x00f:	return (UWord) FIRST_BLK_TO_MBC((Allctr_t *) a1,
 						(Block_t *) a2);
-    case 0x010:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.first;
-    case 0x011:	return (unsigned long) ((Allctr_t *) a1)->mbc_list.last;
-    case 0x012:	return (unsigned long) ((Allctr_t *) a1)->sbc_list.first;
-    case 0x013:	return (unsigned long) ((Allctr_t *) a1)->sbc_list.last;
-    case 0x014:	return (unsigned long) ((Carrier_t *) a1)->next;
-    case 0x015:	return (unsigned long) ((Carrier_t *) a1)->prev;
-    case 0x016:	return (unsigned long) ABLK_HDR_SZ; 
-    case 0x017:	return (unsigned long) ((Allctr_t *) a1)->min_block_size;
-    case 0x018:	return (unsigned long) NXT_BLK((Block_t *) a1);
-    case 0x019:	return (unsigned long) PREV_BLK((Block_t *) a1);
-    case 0x01a: return (unsigned long) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
-    case 0x01b: return (unsigned long) sizeof(Unit_t);
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    case 0x010:	return (UWord) ((Allctr_t *) a1)->mbc_list.first;
+    case 0x011:	return (UWord) ((Allctr_t *) a1)->mbc_list.last;
+    case 0x012:	return (UWord) ((Allctr_t *) a1)->sbc_list.first;
+    case 0x013:	return (UWord) ((Allctr_t *) a1)->sbc_list.last;
+    case 0x014:	return (UWord) ((Carrier_t *) a1)->next;
+    case 0x015:	return (UWord) ((Carrier_t *) a1)->prev;
+    case 0x016:	return (UWord) ABLK_HDR_SZ; 
+    case 0x017:	return (UWord) ((Allctr_t *) a1)->min_block_size;
+    case 0x018:	return (UWord) NXT_BLK((Block_t *) a1);
+    case 0x019:	return (UWord) PREV_BLK((Block_t *) a1);
+    case 0x01a: return (UWord) IS_MBC_FIRST_BLK((Allctr_t*)a1, (Block_t *) a2);
+    case 0x01b: return (UWord) sizeof(Unit_t);
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }
 
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index e0754e7f69..4773598561 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -501,7 +501,7 @@ void	erts_alcu_stop(Allctr_t *);
 void	erts_alcu_verify_unused(Allctr_t *);
 void	erts_alcu_verify_unused_ts(Allctr_t *allctr);
 
-unsigned long	erts_alcu_test(unsigned long, unsigned long, unsigned long);
+UWord	erts_alcu_test(UWord, UWord, UWord);
 
 #ifdef DEBUG
 int is_sbc_blk(Block_t*);
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c
index 6ce209085c..b916cb6198 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.c
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c
@@ -780,19 +780,19 @@ info_options(Allctr_t *allctr,
  * to erts_aoffalc_test()                                                    *
 \*                                                                           */
 
-unsigned long
-erts_aoffalc_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_aoffalc_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x500:	return (unsigned long) 0; /* IS_AOBF */
-    case 0x501:	return (unsigned long) ((AOFFAllctr_t *) a1)->mbc_root;
-    case 0x502:	return (unsigned long) ((AOFF_RBTree_t *) a1)->parent;
-    case 0x503:	return (unsigned long) ((AOFF_RBTree_t *) a1)->left;
-    case 0x504:	return (unsigned long) ((AOFF_RBTree_t *) a1)->right;
-    case 0x506:	return (unsigned long) IS_BLACK((AOFF_RBTree_t *) a1);
-    case 0x508: return (unsigned long) 1; /* IS_AOFF */
-    case 0x509: return (unsigned long) ((AOFF_RBTree_t *) a1)->max_sz;
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    case 0x500:	return (UWord) 0; /* IS_AOBF */
+    case 0x501:	return (UWord) ((AOFFAllctr_t *) a1)->mbc_root;
+    case 0x502:	return (UWord) ((AOFF_RBTree_t *) a1)->parent;
+    case 0x503:	return (UWord) ((AOFF_RBTree_t *) a1)->left;
+    case 0x504:	return (UWord) ((AOFF_RBTree_t *) a1)->right;
+    case 0x506:	return (UWord) IS_BLACK((AOFF_RBTree_t *) a1);
+    case 0x508: return (UWord) 1; /* IS_AOFF */
+    case 0x509: return (UWord) ((AOFF_RBTree_t *) a1)->max_sz;
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }
 
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.h b/erts/emulator/beam/erl_ao_firstfit_alloc.h
index 6fa626f723..21c36c6654 100644
--- a/erts/emulator/beam/erl_ao_firstfit_alloc.h
+++ b/erts/emulator/beam/erl_ao_firstfit_alloc.h
@@ -54,7 +54,7 @@ struct AOFFAllctr_t_ {
     struct AOFF_RBTree_t_* sbmbc_root;
 };
 
-unsigned long erts_aoffalc_test(unsigned long, unsigned long, unsigned long);
+UWord erts_aoffalc_test(UWord, UWord, UWord);
 
 #endif /* #if defined(GET_ERL_AOFF_ALLOC_IMPL)
 	      && !defined(ERL_AOFF_ALLOC_IMPL__) */
diff --git a/erts/emulator/beam/erl_bestfit_alloc.c b/erts/emulator/beam/erl_bestfit_alloc.c
index 5625622e3f..ed843a51fb 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.c
+++ b/erts/emulator/beam/erl_bestfit_alloc.c
@@ -972,20 +972,20 @@ info_options(Allctr_t *allctr,
  * to erts_bfalc_test()                                                      *
 \*                                                                           */
 
-unsigned long
-erts_bfalc_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_bfalc_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x200:	return (unsigned long) ((BFAllctr_t *) a1)->address_order;
-    case 0x201:	return (unsigned long) ((BFAllctr_t *) a1)->mbc_root;
-    case 0x202:	return (unsigned long) ((RBTree_t *) a1)->parent;
-    case 0x203:	return (unsigned long) ((RBTree_t *) a1)->left;
-    case 0x204:	return (unsigned long) ((RBTree_t *) a1)->right;
-    case 0x205:	return (unsigned long) ((RBTreeList_t *) a1)->next;
-    case 0x206:	return (unsigned long) IS_BLACK((RBTree_t *) a1);
-    case 0x207:	return (unsigned long) IS_TREE_NODE((RBTree_t *) a1);
-    case 0x208:	return (unsigned long) 0; /* IS_AOFF */
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    case 0x200:	return (UWord) ((BFAllctr_t *) a1)->address_order;
+    case 0x201:	return (UWord) ((BFAllctr_t *) a1)->mbc_root;
+    case 0x202:	return (UWord) ((RBTree_t *) a1)->parent;
+    case 0x203:	return (UWord) ((RBTree_t *) a1)->left;
+    case 0x204:	return (UWord) ((RBTree_t *) a1)->right;
+    case 0x205:	return (UWord) ((RBTreeList_t *) a1)->next;
+    case 0x206:	return (UWord) IS_BLACK((RBTree_t *) a1);
+    case 0x207:	return (UWord) IS_TREE_NODE((RBTree_t *) a1);
+    case 0x208:	return (UWord) 0; /* IS_AOFF */
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }
 
diff --git a/erts/emulator/beam/erl_bestfit_alloc.h b/erts/emulator/beam/erl_bestfit_alloc.h
index 0c29662852..f2d2f07d7a 100644
--- a/erts/emulator/beam/erl_bestfit_alloc.h
+++ b/erts/emulator/beam/erl_bestfit_alloc.h
@@ -59,7 +59,7 @@ struct BFAllctr_t_ {
     int 		address_order;
 };
 
-unsigned long erts_bfalc_test(unsigned long, unsigned long, unsigned long);
+UWord erts_bfalc_test(UWord, UWord, UWord);
 
 #endif /* #if defined(GET_ERL_BF_ALLOC_IMPL)
 	      && !defined(ERL_BF_ALLOC_IMPL__) */
diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index c2088929e9..79d8b40f8c 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -589,16 +589,16 @@ info_options(Allctr_t *allctr,
  * to erts_gfalc_test()                                                      *
 \*                                                                           */
 
-unsigned long
-erts_gfalc_test(unsigned long op, unsigned long a1, unsigned long a2)
+UWord
+erts_gfalc_test(UWord op, UWord a1, UWord a2)
 {
     switch (op) {
-    case 0x100:	return (unsigned long) BKT_IX((GFAllctr_t *) a1, (Uint) a2);
-    case 0x101:	return (unsigned long) BKT_MIN_SZ((GFAllctr_t *) a1, (int) a2);
-    case 0x102:	return (unsigned long) NO_OF_BKTS;
-    case 0x103:	return (unsigned long)
+    case 0x100:	return (UWord) BKT_IX((GFAllctr_t *) a1, (Uint) a2);
+    case 0x101:	return (UWord) BKT_MIN_SZ((GFAllctr_t *) a1, (int) a2);
+    case 0x102:	return (UWord) NO_OF_BKTS;
+    case 0x103:	return (UWord)
 		    find_bucket(&((GFAllctr_t *) a1)->bucket_mask, (int) a2);
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 }
 
diff --git a/erts/emulator/beam/erl_goodfit_alloc.h b/erts/emulator/beam/erl_goodfit_alloc.h
index a554a6f466..11bef77e7f 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.h
+++ b/erts/emulator/beam/erl_goodfit_alloc.h
@@ -82,7 +82,7 @@ struct GFAllctr_t_ {
 
 };
 
-unsigned long erts_gfalc_test(unsigned long, unsigned long, unsigned long);
+UWord erts_gfalc_test(UWord, UWord, UWord);
 
 #endif /* #if defined(GET_ERL_GF_ALLOC_IMPL)
 	      && !defined(ERL_GF_ALLOC_IMPL__) */