Merge mainline into community

Conflicts:
	src/boot/platforms.r

Author: earl

src/boot/natives.r

@@ -272,7 +272,6 @@ remove-each: native [
 return: native [
 	{Returns a value from a function.}
 	value [any-type!]
-	/redo {Upon return, re-evaluate the returned result. (Used for DO)}
 ]
 
 switch: native [

src/boot/platforms.r

@@ -17,7 +17,7 @@ REBOL [
 Amiga		[1 m68k20+ 2 m68k 3 ppc]
 Macintosh	[1 mac-ppc 2 mac-m68k 3 mac-misc 4 osx-ppc 5 osx-x86]
 Windows		[1 win32-x86 2 dec-alpha 3 win32-x64]
-Linux		[1 libc5-x86 2 libc6-2-3-x86 3 libc6-2-5-x86 4 libc6-2-11-x86 10 libc6-ppc 20 libc6-arm 30 libc6-mips 40 libc-x64]
+Linux		[1 libc5-x86 2 libc6-2-3-x86 3 libc6-2-5-x86 4 libc6-2-11-x86 10 libc6-ppc 20 libc6-arm 21 bionic-arm 30 libc6-mips 40 libc-x64]
 Haiku		[75 x86-32]
 BSDi		[1 x86]
 FreeBSD		[1 x86 2 elf-x86]

src/core/m-gc.c

@@ -81,6 +81,10 @@
 #include "sys-core.h"
 #include "reb-evtypes.h"
 
+#ifdef REB_API
+extern REBOL_HOST_LIB *Host_Lib;
+#endif
+
 //-- For Serious Debugging:
 #ifdef WATCH_GC_VALUE
 REBSER *Watcher = 0;
@@ -173,12 +177,32 @@ static void Mark_Series(REBSER *series, REBCNT depth);
 		while(req) {
 			// The ->port field of the REBREQ is void*, so we must cast
 			// Comment says it is "link back to REBOL port object"
-			CHECK_MARK((REBSER*)req->port, depth);
+			if (req->port) CHECK_MARK((REBSER*)req->port, depth);
 			req = req->next;
 		}
 	}
 }
 
+/***********************************************************************
+**
+*/ static void Mark_Devices(REBCNT depth)
+/*
+**  Mark all devices. Search for pending requests.
+**
+***********************************************************************/
+{
+	int d;
+	REBDEV *dev;
+	REBREQ *req;
+	REBDEV **devices = Host_Lib->devices;
+	
+	for (d = 0; d < RDI_MAX; d++) {
+		dev = devices[d];
+		if (dev)
+			for (req = dev->pending; req; req = req->next)
+				if (req->port) CHECK_MARK((REBSER*)req->port, depth);
+	}
+}
 
 /***********************************************************************
 **
@@ -556,6 +580,9 @@ static void Mark_Series(REBSER *series, REBCNT depth);
 	Mark_Series(VAL_SERIES(ROOT_ROOT), 0);
 	Mark_Series(Task_Series, 0);
 
+	// Mark all devices:
+	Mark_Devices(0);
+	
 	count = Sweep_Series();
 	count += Sweep_Gobs();
 

src/core/n-control.c

@@ -687,7 +687,6 @@ enum {
 {
 	REBVAL *arg = D_ARG(1);
 
-	if (D_REF(2)) VAL_SET_OPT(arg, OPTS_REVAL);
 	SET_THROW(ds, RE_RETURN, arg);
 	return R_RET;
 }

src/core/n-system.c

@@ -443,19 +443,21 @@ REBYTE *evoke_help = "Evoke values:\n"
 	case CODI_CHECK:
 		return R_TRUE;
 
-	case CODI_BINARY:
-	case CODI_TEXT:
+	case CODI_BINARY: //used on encode
+	case CODI_TEXT: //used on decode
 		ser = Make_Binary(codi.len);
 		ser->tail = codi.len;
 		memcpy(BIN_HEAD(ser), codi.data, codi.len);
 		Set_Binary(D_RET, ser);
 		if (result != CODI_BINARY) VAL_SET(D_RET, REB_STRING);
-		
-		// See notice in reb-codec.h on reb_codec_image 
-		Free_Mem(codi.data, codi.len);
+
+		//don't free the text binary input buffer during decode (it's the 3rd arg value in fact)
+		if (result == CODI_BINARY)
+			// See notice in reb-codec.h on reb_codec_image 
+			Free_Mem(codi.data, codi.len);
 		break;
 
-	case CODI_IMAGE:
+	case CODI_IMAGE: //used on decode
 		ser = Make_Image(codi.w, codi.h, TRUE); // Puts it into RETURN stack position
 		memcpy(IMG_DATA(ser), codi.bits, codi.w * codi.h * 4);
 		SET_IMAGE(D_RET, ser);

src/core/u-parse.c

@@ -527,6 +527,11 @@ void Print_Parse_Index(REBCNT type, REBVAL *rules, REBSER *series, REBCNT index)
 				i = Find_Str_Char(series, 0, index, series->tail, 1, VAL_CHAR(item), HAS_CASE(parse));
 				if (i != NOT_FOUND && is_thru) i++;
 			}
+			// bitset
+			else if (IS_BITSET(item)) {
+				i = Find_Str_Bitset(series, 0, index, series->tail, 1, VAL_BITSET(item), HAS_CASE(parse));
+				if (i != NOT_FOUND && is_thru) i++;
+			}
 		}
 	}
 

src/core/u-zlib.c

@@ -287,6 +287,8 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
     }
     if (strm->zfree == Z_NULL) strm->zfree = zcfree;
 
+	if (!strm->checksum) strm->checksum = adler32;
+	
     if (level == Z_DEFAULT_COMPRESSION) level = 6;
 /* #ifdef FASTEST */
 /*     level = 1; */

src/include/reb-codec.h

@@ -35,11 +35,16 @@
 // of size (->w * ->h * 4).  This will be freed by the
 // REBNATIVE(do_codec) in n-system.c
 //
-// If your codec routine returns CODI_BINARY or CODI_TEXT, it is
+// If your codec routine returns CODI_BINARY, it is
 // expected that the ->data field contains a block of memory
 // allocated with Make_Mem of size ->len.  This will be freed by
 // the REBNATIVE(do_codec) in n-system.c
 //
+// If your codec routine returns CODI_TEXT, it is
+// expected that the ->data field is 3rd input binary! argument in
+// the REBNATIVE(do_codec) in n-system.c
+// so the deallocation is left to GC
+//
 typedef struct reb_codec_image {
 	int action;
 	int w;

src/mezz/base-funcs.r

@@ -41,7 +41,7 @@ function: funct: func [
 	body: copy/deep body
 	; Collect all set-words in the body as words to be used as locals, and add
 	; them to the spec. Don't include the words already in the spec or object.
-	append spec collect-words/deep/set/ignore body either with [
+	insert find/tail spec /local collect-words/deep/set/ignore body either with [
 		; Make our own local object if a premade one is not provided
 		unless object? object [object: make object! object]
 		bind body object  ; Bind any object words found in the body

src/mezz/mezz-func.r

@@ -35,7 +35,7 @@ closure: func [
 	body: copy/deep body
 	; Collect all set-words in the body as words to be used as locals, and add
 	; them to the spec. Don't include the words already in the spec or object.
-	append spec collect-words/deep/set/ignore body either with [
+	insert find/tail spec /local collect-words/deep/set/ignore body either with [
 		; Make our own local object if a premade one is not provided
 		unless object? object [object: make object! object]
 		bind body object  ; Bind any object words found in the body

src/os/posix/dev-file.c

@@ -53,6 +53,14 @@
 #define O_BINARY 0
 #endif
 
+// The BSD legacy names S_IREAD/S_IWRITE are not defined on e.g. Android.
+#ifndef S_IREAD
+#define S_IREAD S_IRUSR
+#endif
+#ifndef S_IWRITE
+#define S_IWRITE S_IWUSR
+#endif
+
 // NOTE: the code below assumes a file id will never by zero. This should
 // be safe. In posix, zero is stdin, which is handled by dev-stdio.c.
 

src/tools/make-os-ext.r

@@ -130,7 +130,8 @@ process: func [file] [
 remit {
 typedef struct REBOL_Host_Lib ^{
 	int size;
-	unsigned int ver_sum;}
+	unsigned int ver_sum;
+	REBDEV **devices;}
 
 memit {
 extern	REBOL_HOST_LIB *Host_Lib;
@@ -152,6 +153,7 @@ out: reduce [
 #define HOST_LIB_SUM } checksum/tcp to-binary xsum {
 #define HOST_LIB_SIZE } cnt {
 
+extern REBDEV *Devices[];
 }
 rlib
 {
@@ -169,6 +171,7 @@ REBOL_HOST_LIB *Host_Lib;
 REBOL_HOST_LIB Host_Lib_Init = ^{  // Host library function vector table.
 	HOST_LIB_SIZE,
 	(HOST_LIB_VER << 16) + HOST_LIB_SUM,
+	(REBDEV**)&Devices,
 }
 dlib
 {^};

src/tools/systems.r

@@ -30,23 +30,27 @@ systems: [
 	[0.4.04 "linux"      posix  [+O2 HID LDL ST1 M32 -LM]]	; libc 2.11
 	[0.4.10 "linux_ppc"  posix  [+O1 HID LDL ST1 -LM]]
 	[0.4.20 "linux_arm"  posix  [+O2 HID LDL ST1 -LM]]
+	[0.4.21 "linux_arm"  posix  [+O2 HID LDL ST1 -LM PIE]]  ; bionic (Android)
 	[0.4.30 "linux_mips" posix  [+O2 HID LDL ST1 -LM]]  ; glibc does not need C++
 	[0.4.40 "linux_x64"  posix  [+O2 HID LDL ST1 -LM]]
 	[0.5.75 "haiku"      posix  [+O2 ST1 NWK]]
 	[0.7.02 "freebsd"    posix  [+O1 C++ ST1 -LM]]
 	[0.9.04 "openbsd"    posix  [+O1 C++ ST1 -LM]]
+	[0.13.01 "android_arm"  android  [HID F64 LDL LLOG -LM CST]]
 ]
 
 compile-flags: [
 	+OS: "-Os"                    ; size optimize
 	+O1: "-O1"                    ; full optimize
 	+O2: "-O2"                    ; full optimize
 	UNI: "-DUNICODE"              ; win32 wants it
+	CST: "-DCUSTOM_STARTUP"		  ; include custom startup script at host boot
 	HID: "-fvisibility=hidden"    ; all syms are hidden
 	F64: "-D_FILE_OFFSET_BITS=64" ; allow larger files
 	NPS: "-Wno-pointer-sign"      ; OSX fix
 	NSP: "-fno-stack-protector"   ; avoid insert of functions names
 	PIC: "-fPIC"                  ; position independent (used for libs)
+	PIE: "-fPIE"                  ; position independent (executables)
 	DYN: "-dynamic"               ; optimize for dll??
 	NCM: "-fno-common"            ; lib cannot have common vars
 	PAK: "-fpack-struct"          ; pack structures
@@ -59,6 +63,7 @@ linker-flags: [
 	STA: "--strip-all"
 	C++: "-lstdc++" ; link with stdc++
 	LDL: "-ldl"     ; link with dynamic lib lib
+	LLOG: "-llog"	; on Android, link with liblog.so
 	ARC: "-arch i386" ; x86 32 bit architecture (OSX)
 	M32: "-m32"       ; use 32-bit memory model (Linux x64)
 	W32: "-lwsock32 -lcomdlg32"