CHANGE: enhanced number of possible series flags from 8 to 32 (could be lowered in the future and use some of these bits for something else)

Author: Oldes

src/core/c-do.c

@@ -1055,7 +1055,7 @@ x*/	static REBINT Do_Args_Light(REBVAL *func, REBVAL *path, REBSER *block, REBCN
 
 	CHECK_MEMORY(4); // Be sure we don't go far with a problem.
 
-	ASSERT1(block->info, RP_GC_OF_BLOCK);
+	ASSERT1(SERIES_SIZES(block), RP_GC_OF_BLOCK);
 
 	while (index < BLK_LEN(block)) {
 		index = Do_Next(block, index, 0);

src/core/c-word.c

@@ -119,7 +119,8 @@
 
 	oser = *ser;
 	*ser = *nser;
-	ser->info = oser.info;
+	ser->sizes = oser.sizes;
+	ser->flags = oser.flags;
 	*nser = oser;
 
 	Clear_Series(ser);

src/core/m-pools.c

@@ -447,7 +447,8 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 	series->tail = series->size = 0;
 	SERIES_REST(series) = length / wide; //FIXME: This is based on the assumption that length is multiple of wide
 	series->data = (REBYTE *)node;
-	series->info = wide; // also clears flags
+	series->sizes = wide; // also clears bias
+	SERIES_FLAGS(series) = 0;
 	LABEL_SERIES(series, "make");
 
 	if ((GC_Ballast -= length) <= 0) SET_SIGNAL(SIG_RECYCLE);
@@ -533,7 +534,8 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 clear_header:
 	if (protect) {
 		series->data = BAD_MEM_PTR; // force bad references to trap
-		series->info = 0;  // indicates series deallocated (wide = 0)
+		series->sizes = 0;  // indicates series deallocated (wide = 0)
+		series->flags = 0;
 	}
 }
 
@@ -563,7 +565,8 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 	if (!IS_EXT_SERIES(series)) {
 		Free_Series_Data(series, TRUE);
 	}
-	series->info = 0; // includes width
+	series->sizes = 0; // includes bias and width
+	series->flags = 0;
 	//series->data = BAD_MEM_PTR;
 	//series->tail = 0xBAD2BAD2;
 	//series->size = 0xBAD3BAD3;
@@ -633,7 +636,8 @@ const REBPOOLSPEC Mem_Pool_Spec[MAX_POOLS] =
 **
 ***********************************************************************/
 {
-	newser->info = oldser->info;
+	newser->sizes = oldser->sizes;
+	newser->flags = oldser->flags;
 	newser->all = oldser->all;
 #ifdef SERIES_LABELS
 	newser->label = oldser->label;

src/core/t-vector.c

@@ -160,7 +160,7 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 			set_vect(bits, ser->data, n++, (REBI64)(data[idx]), f);
 		}
 #else
-		REBCNT bytes = ser->tail * ser->info;
+		REBCNT bytes = ser->tail * SERIES_WIDE(ser); //TODO: review! Wide is max 256 bytes!!!
 		if (len > bytes) len = bytes;
 		COPY_MEM(ser->data, VAL_BIN_DATA(blk), len);
 #endif

src/include/sys-value.h

@@ -389,10 +389,8 @@ static REBCNT byte_sizes[4] = { 1, 2, 4, 8 };
 	REBYTE	*data;		// series data head
 	REBLEN	tail;		// one past end of useful data
 	REBLEN	rest;		// total number of units from bias to end
-	REBINT	info;		// holds width and flags
-#if defined(__LP64__) || defined(__LLP64__)
-	REBCNT	padding;	// ensure next pointer is naturally aligned
-#endif
+	REBINT  sizes;      // 16 bits bias, 8 bits reserved, 8 bits wide!
+	REBCNT  flags;
 	union {
 		REBCNT size;	// used for vectors and bitsets
 		REBSER *series;	// MAP datatype uses this
@@ -410,8 +408,9 @@ static REBCNT byte_sizes[4] = { 1, 2, 4, 8 };
 #define SERIES_TAIL(s)	 ((s)->tail)
 #define SERIES_REST(s)	 ((s)->rest)
 #define	SERIES_LEN(s)    ((s)->tail + 1) // Includes terminator
-#define	SERIES_FLAGS(s)	 ((s)->info)
-#define	SERIES_WIDE(s)	 (((s)->info) & 0xff)
+#define	SERIES_SIZES(s)  ((s)->sizes)
+#define	SERIES_FLAGS(s)	 ((s)->flags)
+#define	SERIES_WIDE(s)	 (((s)->sizes) & 0xff)
 #define SERIES_DATA(s)   ((s)->data)
 #define	SERIES_SKIP(s,i) (SERIES_DATA(s) + (SERIES_WIDE(s) * (i)))
 
@@ -429,11 +428,11 @@ static REBCNT byte_sizes[4] = { 1, 2, 4, 8 };
 #define	SERIES_FREED(s)  (!SERIES_WIDE(s))
 
 // Bias is empty space in front of head:
-#define	SERIES_BIAS(s)	   (REBCNT)((SERIES_FLAGS(s) >> 16) & 0xffff)
+#define	SERIES_BIAS(s)	   (REBCNT)((SERIES_SIZES(s) >> 16) & 0xffff)
 #define MAX_SERIES_BIAS    0x1000
-#define SERIES_SET_BIAS(s,b) (SERIES_FLAGS(s) = (SERIES_FLAGS(s) & 0xffff) | (b << 16))
-#define SERIES_ADD_BIAS(s,b) (SERIES_FLAGS(s) += (b << 16))
-#define SERIES_SUB_BIAS(s,b) (SERIES_FLAGS(s) -= (b << 16))
+#define SERIES_SET_BIAS(s,b) (SERIES_SIZES(s) = (SERIES_SIZES(s) & 0xffff) | (b << 16))
+#define SERIES_ADD_BIAS(s,b) (SERIES_SIZES(s) += (b << 16))
+#define SERIES_SUB_BIAS(s,b) (SERIES_SIZES(s) -= (b << 16))
 
 // Size in bytes of memory allocated (including bias area):
 #define SERIES_TOTAL(s) ((SERIES_REST(s) + SERIES_BIAS(s)) * (REBCNT)SERIES_WIDE(s))
@@ -462,11 +461,11 @@ static REBCNT byte_sizes[4] = { 1, 2, 4, 8 };
 #define	AT_TAIL	((REBCNT)(~0))	// Extend series at tail
 
 // Is it a byte-sized series? (this works because no other odd size allowed)
-#define BYTE_SIZE(s) (((s)->info) & 1)
+#define BYTE_SIZE(s) (SERIES_SIZES(s) & 1)
 #define VAL_BYTE_SIZE(v) (BYTE_SIZE(VAL_SERIES(v)))
 #define VAL_STR_IS_ASCII(v) (VAL_BYTE_SIZE(v) && !Is_Not_ASCII(VAL_BIN_DATA(v), VAL_LEN(v)))
 
-// Series Flags:
+// Series Flags (max32):
 enum {
 	SER_MARK = 1,		// Series was found during GC mark scan.
 	SER_KEEP = 1<<1,	// Series is permanent, do not GC it.
@@ -479,9 +478,9 @@ enum {
 	SER_INT  = 1<<8,	// Series data is internal (loop frames) and should not be accessed by users
 };
 
-#define SERIES_SET_FLAG(s, f) (SERIES_FLAGS(s) |= ((f) << 8))
-#define SERIES_CLR_FLAG(s, f) (SERIES_FLAGS(s) &= ~((f) << 8))
-#define SERIES_GET_FLAG(s, f) (SERIES_FLAGS(s) &  ((f) << 8))
+#define SERIES_SET_FLAG(s, f) (SERIES_FLAGS(s) |=  (f))
+#define SERIES_CLR_FLAG(s, f) (SERIES_FLAGS(s) &= ~(f))
+#define SERIES_GET_FLAG(s, f) (SERIES_FLAGS(s) &   (f))
 
 #define	IS_FREEABLE(s)    !SERIES_GET_FLAG(s, SER_MARK|SER_KEEP|SER_FREE)
 #define MARK_SERIES(s)    SERIES_SET_FLAG(s, SER_MARK)

src/os/host-ext-test.c

@@ -285,7 +285,7 @@ RXIEXT int RX_Call(int cmd, RXIFRM *frm, void *ctx) {
 		{
 			REBSER *vec = RXA_SERIES(frm, 1);
 			RXA_TYPE(frm, 1) = RXT_INTEGER;
-			RXA_INT64(frm, 1) = vec->info * vec->tail;
+			RXA_INT64(frm, 1) = (vec->sizes & 0xFF) * vec->tail; //TODO: review!
 		}
 		break;
 	case 14: //command [{return vector size in values (from object)} o [object!]]