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

16 files changed, 133 insertions, 125 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__) */
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index b6e2c9382b..2748edba02 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -1749,45 +1749,42 @@ erts_mseg_late_init(void)
 
 #endif /* #if HAVE_ERTS_MSEG */
 
-unsigned long
-erts_mseg_test(unsigned long op,
-	       unsigned long a1,
-	       unsigned long a2,
-	       unsigned long a3)
+UWord
+erts_mseg_test(UWord op, UWord a1, UWord a2, UWord a3)
 {
     switch (op) {
 #if HAVE_ERTS_MSEG
     case 0x400: /* Have erts_mseg */
-	return (unsigned long) 1;
+	return (UWord) 1;
     case 0x401:
-	return (unsigned long) erts_mseg_alloc(ERTS_ALC_A_INVALID, (Uint *) a1, (Uint) 0);
+	return (UWord) erts_mseg_alloc(ERTS_ALC_A_INVALID, (Uint *) a1, (Uint) 0);
     case 0x402:
 	erts_mseg_dealloc(ERTS_ALC_A_INVALID, (void *) a1, (Uint) a2, (Uint) 0);
-	return (unsigned long) 0;
+	return (UWord) 0;
     case 0x403:
-	return (unsigned long) erts_mseg_realloc(ERTS_ALC_A_INVALID,
+	return (UWord) erts_mseg_realloc(ERTS_ALC_A_INVALID,
 						 (void *) a1,
 						 (Uint) a2,
 						 (Uint *) a3,
 						 (Uint) 0);
     case 0x404:
 	erts_mseg_clear_cache();
-	return (unsigned long) 0;
+	return (UWord) 0;
     case 0x405:
-	return (unsigned long) erts_mseg_no(&erts_mseg_default_opt);
+	return (UWord) erts_mseg_no(&erts_mseg_default_opt);
     case 0x406: {
 	ErtsMsegAllctr_t *ma = ERTS_MSEG_ALLCTR_IX(0);
-	unsigned long res;
+	UWord res;
 	ERTS_MSEG_LOCK(ma);
-	res = (unsigned long) tot_cache_size(ma);
+	res = (UWord) tot_cache_size(ma);
 	ERTS_MSEG_UNLOCK(ma);
 	return res;
     }
 #else /* #if HAVE_ERTS_MSEG */
     case 0x400: /* Have erts_mseg */
-	return (unsigned long) 0;
+	return (UWord) 0;
 #endif /* #if HAVE_ERTS_MSEG */
-    default:	ASSERT(0); return ~((unsigned long) 0);
+    default:	ASSERT(0); return ~((UWord) 0);
     }
 
 }
diff --git a/erts/emulator/sys/common/erl_mseg.h b/erts/emulator/sys/common/erl_mseg.h
index 3cab9e18da..a4f250ceab 100644
--- a/erts/emulator/sys/common/erl_mseg.h
+++ b/erts/emulator/sys/common/erl_mseg.h
@@ -109,9 +109,6 @@ Eterm erts_mseg_info(int, int *, void*, int, Uint **, Uint *);
 
 #endif /* #if HAVE_ERTS_MSEG */
 
-unsigned long erts_mseg_test(unsigned long,
-			     unsigned long,
-			     unsigned long,
-			     unsigned long);
+UWord erts_mseg_test(UWord, UWord, UWord, UWord);
 
 #endif /* #ifndef ERL_MSEG_H_ */
diff --git a/erts/emulator/sys/win32/sys_float.c b/erts/emulator/sys/win32/sys_float.c
index e2a777d182..0e19746cf5 100644
--- a/erts/emulator/sys/win32/sys_float.c
+++ b/erts/emulator/sys/win32/sys_float.c
@@ -52,7 +52,7 @@ void erts_thread_disable_fpe(void)
 int 
 sys_chars_to_double(char *buf, double *fp)
 {
-    char *s = buf, *t, *dp;
+    unsigned char *s = buf, *t, *dp;
     
     /* Robert says that something like this is what he really wanted:
      * (The [.,] radix test is NOT what Robert wanted - it was added later)
@@ -120,7 +120,7 @@ sys_chars_to_double(char *buf, double *fp)
 int
 sys_double_to_chars_ext(double fp, char *buffer, size_t buffer_size, size_t decimals)
 {
-    char *s = buffer;
+    unsigned char *s = buffer;
 
     if (erts_snprintf(buffer, buffer_size, "%.*e", decimals, fp) >= buffer_size)
         return -1;
diff --git a/erts/emulator/test/driver_SUITE_data/thr_alloc_drv.c b/erts/emulator/test/driver_SUITE_data/thr_alloc_drv.c
index 95a6ae9bdf..500725a7cd 100644
--- a/erts/emulator/test/driver_SUITE_data/thr_alloc_drv.c
+++ b/erts/emulator/test/driver_SUITE_data/thr_alloc_drv.c
@@ -58,7 +58,7 @@ void *
 test_thread(void *vsize)
 {
     int i;
-    int size = (int) (long) vsize;
+    int size = (int) (ErlDrvSInt) vsize;
     void *mem;
     mem = driver_alloc(size);
     if (mem)
@@ -88,7 +88,7 @@ ErlDrvSSizeT control(ErlDrvData drv_data, unsigned int command, char *buf,
 	    res = erl_drv_thread_create("test_thread",
 					&tid,
 					test_thread,
-					(void *) (long) size,
+					(void *) (ErlDrvSInt) size,
 					NULL);
 	    if (res == 0) {
 		res = erl_drv_thread_join(tid, NULL);
diff --git a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
index c8f286f629..0c4a9f7e5c 100644
--- a/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
+++ b/erts/emulator/test/nif_SUITE_data/nif_SUITE.c
@@ -40,7 +40,7 @@ typedef struct
     int ref_cnt;
     CallInfo* call_history;
     NifModPrivData* nif_mod;
-    union { ErlNifResourceType* t; long l; } rt_arr[2];
+    union { ErlNifResourceType* t; void* vp; } rt_arr[2];
 } PrivData;
 
 /*
@@ -93,6 +93,23 @@ struct binary_resource {
     unsigned size;
 };
 
+static int get_pointer(ErlNifEnv* env, ERL_NIF_TERM term, void** pp)
+{
+    ErlNifUInt64 i64;
+    int r = enif_get_uint64(env, term, &i64);
+    if (r) {
+	*pp = (void*)i64;
+    }
+    return r;
+}
+
+static ERL_NIF_TERM make_pointer(ErlNifEnv* env, void* p)
+{
+    ErlNifUInt64 i64 = (ErlNifUInt64) p;
+    return enif_make_uint64(env, i64);
+}
+
+
 static int load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
 {
     PrivData* data = enif_alloc(sizeof(PrivData));
@@ -224,15 +241,15 @@ static ERL_NIF_TERM call_history(ErlNifEnv* env, int argc, const ERL_NIF_TERM ar
 static ERL_NIF_TERM hold_nif_mod_priv_data(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     PrivData* data = (PrivData*) enif_priv_data(env);
-    unsigned long ptr_as_ulong;
+    void* ptr;
     
-    if (!enif_get_ulong(env,argv[0],&ptr_as_ulong)) {
+    if (!get_pointer(env,argv[0],&ptr)) {
 	return enif_make_badarg(env);
     }
     if (data->nif_mod != NULL) {
 	NifModPrivData_release(data->nif_mod);
     }
-    data->nif_mod = (NifModPrivData*) ptr_as_ulong;    
+    data->nif_mod = (NifModPrivData*) ptr;    
     return enif_make_int(env,++(data->nif_mod->ref_cnt)); 
 }
 
@@ -696,7 +713,7 @@ static ERL_NIF_TERM last_resource_dtor_call(ErlNifEnv* env, int argc, const ERL_
 	memcpy(enif_make_new_binary(env, resource_dtor_last_sz, &bin),
 	       resource_dtor_last_data, resource_dtor_last_sz);
 	ret = enif_make_tuple3(env,
-				enif_make_long(env, (long)resource_dtor_last),
+				make_pointer(env, resource_dtor_last),
 				bin,  
 				enif_make_int(env, resource_dtor_cnt));
     }
@@ -717,40 +734,40 @@ static ERL_NIF_TERM get_resource_type(ErlNifEnv* env, int argc, const ERL_NIF_TE
     if (!enif_get_int(env, argv[0], &ix) || ix >= 2) {
 	return enif_make_badarg(env);
     }
-    return enif_make_long(env, data->rt_arr[ix].l);
+    return make_pointer(env, data->rt_arr[ix].vp);
 }
 
 static ERL_NIF_TERM alloc_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifBinary data_bin;
-    union { ErlNifResourceType* t; long l; } type;
-    union { void* p; long l;} data;
-    if (!enif_get_long(env, argv[0], &type.l)
+    union { ErlNifResourceType* t; void* vp; } type;
+    void* data;
+    if (!get_pointer(env, argv[0], &type.vp)
 	|| !enif_inspect_binary(env, argv[1], &data_bin)
-	|| (data.p = enif_alloc_resource(type.t, data_bin.size))==NULL) {
+	|| (data = enif_alloc_resource(type.t, data_bin.size))==NULL) {
 
 	return enif_make_badarg(env);
     }
-    memcpy(data.p, data_bin.data, data_bin.size);
-    return enif_make_long(env, data.l);
+    memcpy(data, data_bin.data, data_bin.size);
+    return make_pointer(env, data);
 }
 
 static ERL_NIF_TERM make_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
-    union { void* p; long l; } data;
-    if (!enif_get_long(env, argv[0], &data.l)) {
+    void* data;
+    if (!get_pointer(env, argv[0], &data)) {
 	return enif_make_badarg(env);
     }
-    return enif_make_resource(env, data.p);
+    return enif_make_resource(env, data);
 }
 
 static ERL_NIF_TERM make_new_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifBinary data_bin;
-    union { ErlNifResourceType* t; long l; } type;
+    union { ErlNifResourceType* t; void* vp; } type;
     void* data;
     ERL_NIF_TERM ret;
-    if (!enif_get_long(env, argv[0], &type.l)
+    if (!get_pointer(env, argv[0], &type.vp)
 	|| !enif_inspect_binary(env, argv[1], &data_bin)
 	|| (data = enif_alloc_resource(type.t, data_bin.size))==NULL) {
 
@@ -765,7 +782,7 @@ static ERL_NIF_TERM make_new_resource(ErlNifEnv* env, int argc, const ERL_NIF_TE
 static ERL_NIF_TERM make_new_resource_binary(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifBinary data_bin;
-    union { struct binary_resource* p; void* vp; long l; } br;
+    union { struct binary_resource* p; void* vp; } br;
     void* buf;
     ERL_NIF_TERM ret;
     if (!enif_inspect_binary(env, argv[0], &data_bin)
@@ -781,7 +798,7 @@ static ERL_NIF_TERM make_new_resource_binary(ErlNifEnv* env, int argc, const ERL
     memcpy(br.p->data, data_bin.data, data_bin.size);    
     ret = enif_make_resource_binary(env, br.vp, br.p->data, br.p->size);    
     enif_release_resource(br.p);
-    return enif_make_tuple2(env, enif_make_long(env,br.l), ret);
+    return enif_make_tuple2(env, make_pointer(env,br.vp), ret);
 }
 
 static void binary_resource_dtor(ErlNifEnv* env, void* obj)
@@ -796,33 +813,33 @@ static void binary_resource_dtor(ErlNifEnv* env, void* obj)
 static ERL_NIF_TERM get_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
     ErlNifBinary data_bin;
-    union { ErlNifResourceType* t; long l; } type;
-    union { void* p; long l; } data;
+    union { ErlNifResourceType* t; void* vp; } type;
+    void* data;
 
     type.t = NULL;
     if (enif_is_identical(argv[0], atom_binary_resource_type)) {
 	type.t = binary_resource_type;
     }
     else {
-	enif_get_long(env, argv[0], &type.l);
+	get_pointer(env, argv[0], &type.vp);
     }
     if (type.t == NULL 
-	|| !enif_get_resource(env, argv[1], type.t, &data.p)) {
+	|| !enif_get_resource(env, argv[1], type.t, &data)) {
 	return enif_make_badarg(env);
     }
-    enif_alloc_binary(enif_sizeof_resource(data.p), &data_bin);    
-    memcpy(data_bin.data, data.p, data_bin.size);
-    return enif_make_tuple2(env, enif_make_long(env,data.l),
+    enif_alloc_binary(enif_sizeof_resource(data), &data_bin);    
+    memcpy(data_bin.data, data, data_bin.size);
+    return enif_make_tuple2(env, make_pointer(env,data),
 			    enif_make_binary(env, &data_bin));
 }
 
 static ERL_NIF_TERM release_resource(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
-    union { void* p; long l; } data;
-    if (!enif_get_long(env, argv[0], &data.l)) {
+    void* data;
+    if (!get_pointer(env, argv[0], &data)) {
 	return enif_make_badarg(env);
     }
-    enif_release_resource(data.p);
+    enif_release_resource(data);
     return enif_make_atom(env,"ok");
 }