Store pointers to heap data in 32-bit words

Store Erlang terms in 32-bit entities on the heap, expanding the
pointers to 64-bit when needed. This works because all terms are stored
on addresses in the 32-bit address range (the 32 most significant bits
of pointers to term data are always 0).

Introduce a new datatype called UWord (along with its companion SWord),
which is an integer having the exact same size as the machine word
(a void *), but might be larger than Eterm/Uint.

Store code as machine words, as the instructions are pointers to
executable code which might reside outside the 32-bit address range.

Continuation pointers are stored on the 32-bit stack and hence must
point to addresses in the low range, which means that loaded beam code
much be placed in the low 32-bit address range (but, as said earlier,
the instructions themselves are full words).

No Erlang term data can be stored on C stacks (enforced by an
earlier commit).

This version gives a prompt, but test cases still fail (and dump core).

The loader (and emulator loop) has instruction packing disabled.

The main issues has been in rewriting loader and actual virtual
machine. Subsystems (like distribution) does not work yet.

1 files changed, 24 insertions, 24 deletions

diff --git a/erts/emulator/beam/erl_goodfit_alloc.c b/erts/emulator/beam/erl_goodfit_alloc.c
index ea2ba4d55c..33d93d344d 100644
--- a/erts/emulator/beam/erl_goodfit_alloc.c
+++ b/erts/emulator/beam/erl_goodfit_alloc.c
@@ -49,30 +49,30 @@
 #define MIN_MBC_FIRST_FREE_SZ		(4*1024)
 
 #define MAX_SUB_MASK_IX \
-  ((((Uint)1) << (NO_OF_BKT_IX_BITS - SUB_MASK_IX_SHIFT)) - 1)
-#define MAX_SUB_BKT_IX ((((Uint)1) << SUB_MASK_IX_SHIFT) - 1)
+  ((((UWord)1) << (NO_OF_BKT_IX_BITS - SUB_MASK_IX_SHIFT)) - 1)
+#define MAX_SUB_BKT_IX ((((UWord)1) << SUB_MASK_IX_SHIFT) - 1)
 #define MAX_BKT_IX (NO_OF_BKTS - 1)
 
-#define MIN_BLK_SZ  UNIT_CEILING(sizeof(GFFreeBlock_t) + sizeof(Uint))
+#define MIN_BLK_SZ  UNIT_CEILING(sizeof(GFFreeBlock_t) + sizeof(UWord))
 
-#define IX2SBIX(IX) ((IX) & (~(~((Uint)0) << SUB_MASK_IX_SHIFT)))
+#define IX2SBIX(IX) ((IX) & (~(~((UWord)0) << SUB_MASK_IX_SHIFT)))
 #define IX2SMIX(IX) ((IX) >> SUB_MASK_IX_SHIFT)
 #define MAKE_BKT_IX(SMIX, SBIX)	\
-  ((((Uint)(SMIX)) << SUB_MASK_IX_SHIFT) | ((Uint)(SBIX)))
+  ((((UWord)(SMIX)) << SUB_MASK_IX_SHIFT) | ((UWord)(SBIX)))
 
 #define SET_BKT_MASK_IX(BM, IX)						\
 do {									\
     int sub_mask_ix__ = IX2SMIX((IX));					\
-    (BM).main |= (((Uint) 1) << sub_mask_ix__);				\
-    (BM).sub[sub_mask_ix__] |= (((Uint)1) << IX2SBIX((IX)));		\
+    (BM).main |= (((UWord) 1) << sub_mask_ix__);				\
+    (BM).sub[sub_mask_ix__] |= (((UWord)1) << IX2SBIX((IX)));		\
 } while (0)
 
 #define UNSET_BKT_MASK_IX(BM, IX)					\
 do {									\
     int sub_mask_ix__ = IX2SMIX((IX));					\
-    (BM).sub[sub_mask_ix__] &= ~(((Uint)1) << IX2SBIX((IX)));		\
+    (BM).sub[sub_mask_ix__] &= ~(((UWord)1) << IX2SBIX((IX)));		\
     if (!(BM).sub[sub_mask_ix__])					\
-	(BM).main &= ~(((Uint)1) << sub_mask_ix__);			\
+	(BM).main &= ~(((UWord)1) << sub_mask_ix__);			\
 } while (0)
 
 /* Buckets ... */
@@ -263,8 +263,8 @@ find_bucket(BucketMask_t *bmask, int min_index)
     while(max != min) {					\
 	mid = ((max - min) >> 1) + min;			\
 	if((BitMask)					\
-	   & (~(~((Uint) 0) << (mid + 1)))		\
-	   & (~((Uint) 0) << min))			\
+	   & (~(~((UWord) 0) << (mid + 1)))		\
+	   & (~((UWord) 0) << min))			\
 	    max = mid;					\
 	else						\
 	    min = mid + 1;				\
@@ -272,21 +272,21 @@ find_bucket(BucketMask_t *bmask, int min_index)
     (MinBit) = min
 
 
-    ASSERT(bmask->main < (((Uint) 1) << (MAX_SUB_MASK_IX+1)));
+    ASSERT(bmask->main < (((UWord) 1) << (MAX_SUB_MASK_IX+1)));
 
     sub_mask_ix = IX2SMIX(min_index);
 
-    if ((bmask->main & (~((Uint) 0) << sub_mask_ix)) == 0)
+    if ((bmask->main & (~((UWord) 0) << sub_mask_ix)) == 0)
 	return -1;
 
     /* There exists a non empty bucket; find it... */
 
-    if (bmask->main & (((Uint) 1) << sub_mask_ix)) {
+    if (bmask->main & (((UWord) 1) << sub_mask_ix)) {
 	sub_bkt_ix = IX2SBIX(min_index);
-	if ((bmask->sub[sub_mask_ix] & (~((Uint) 0) << sub_bkt_ix)) == 0) {
+	if ((bmask->sub[sub_mask_ix] & (~((UWord) 0) << sub_bkt_ix)) == 0) {
 	    sub_mask_ix++;
 	    sub_bkt_ix = 0;
-	    if ((bmask->main & (~((Uint) 0)<< sub_mask_ix)) == 0)
+	    if ((bmask->main & (~((UWord) 0)<< sub_mask_ix)) == 0)
 		return -1;
 	}
 	else
@@ -299,17 +299,17 @@ find_bucket(BucketMask_t *bmask, int min_index)
 
     ASSERT(sub_mask_ix <= MAX_SUB_MASK_IX);
     /* Has to be a bit > sub_mask_ix */
-    ASSERT(bmask->main & (~((Uint) 0) << (sub_mask_ix)));
+    ASSERT(bmask->main & (~((UWord) 0) << (sub_mask_ix)));
     GET_MIN_BIT(sub_mask_ix, bmask->main, sub_mask_ix, MAX_SUB_MASK_IX);
 
  find_sub_bkt_ix:
     ASSERT(sub_mask_ix <= MAX_SUB_MASK_IX);
     ASSERT(sub_bkt_ix <= MAX_SUB_BKT_IX);
 
-    if ((bmask->sub[sub_mask_ix] & (((Uint) 1) << sub_bkt_ix)) == 0) {
+    if ((bmask->sub[sub_mask_ix] & (((UWord) 1) << sub_bkt_ix)) == 0) {
 	ASSERT(sub_mask_ix + 1 <= MAX_SUB_BKT_IX);
 	/* Has to be a bit > sub_bkt_ix */
-	ASSERT(bmask->sub[sub_mask_ix] & (~((Uint) 0) << sub_bkt_ix));
+	ASSERT(bmask->sub[sub_mask_ix] & (~((UWord) 0) << sub_bkt_ix));
 
 	GET_MIN_BIT(sub_bkt_ix,
 		    bmask->sub[sub_mask_ix],
@@ -336,7 +336,7 @@ search_bucket(Allctr_t *allctr, int ix, Uint size)
     Uint min_sz;
     Uint blk_sz;
     Uint cand_sz = 0;
-    Uint max_blk_search;
+    UWord max_blk_search;
     GFFreeBlock_t *blk;
     GFFreeBlock_t *cand = NULL;
     int blk_on_lambc;
@@ -615,9 +615,9 @@ check_block(Allctr_t *allctr, Block_t * blk, int free_block)
 	Uint blk_sz = BLK_SZ(blk);
 	bi = BKT_IX(gfallctr, blk_sz);
 
-	ASSERT(gfallctr->bucket_mask.main & (((Uint) 1) << IX2SMIX(bi)));
+	ASSERT(gfallctr->bucket_mask.main & (((UWord) 1) << IX2SMIX(bi)));
 	ASSERT(gfallctr->bucket_mask.sub[IX2SMIX(bi)]
-	       & (((Uint) 1) << IX2SBIX(bi)));
+	       & (((UWord) 1) << IX2SBIX(bi)));
 		
 	found = 0;
 	for (fblk = gfallctr->buckets[bi]; fblk; fblk = fblk->next)
@@ -648,9 +648,9 @@ check_mbc(Allctr_t *allctr, Carrier_t *mbc)
     int bi;
 
     for(bi = 0; bi < NO_OF_BKTS; bi++) {
-	if ((gfallctr->bucket_mask.main & (((Uint) 1) << IX2SMIX(bi)))
+	if ((gfallctr->bucket_mask.main & (((UWord) 1) << IX2SMIX(bi)))
 	    && (gfallctr->bucket_mask.sub[IX2SMIX(bi)]
-		& (((Uint) 1) << IX2SBIX(bi)))) {
+		& (((UWord) 1) << IX2SBIX(bi)))) {
 	    ASSERT(gfallctr->buckets[bi] != NULL);
 	}
 	else {