CHANGE: bitwise operation on binary: the shorter argument is used repeatedly

Author: Oldes

src/core/n-sets.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -199,7 +200,7 @@ enum {
 			i = 0; // special case
 			break;
 		}
-		ser = Xandor_Binary(i, val1, val2);
+		ser = Xandor_Bitset(i, val1, val2);
 		Set_Series(REB_BITSET, D_RET, ser);
 		break;
 

src/core/s-ops.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +23,7 @@
 **  Module:  s-ops.c
 **  Summary: string handling utilities
 **  Section: strings
-**  Author:  Carl Sassenrath
+**  Author:  Carl Sassenrath, Oldes
 **  Notes:
 **
 ***********************************************************************/
@@ -188,9 +189,9 @@
 
 /***********************************************************************
 **
-*/  REBSER *Xandor_Binary(REBCNT action, REBVAL *value, REBVAL *arg)
+*/  REBSER *Xandor_Bitset(REBCNT action, REBVAL *value, REBVAL *arg)
 /*
-**		Only valid for BINARY data.
+**		Only valid for Bitsets data.
 **
 ***********************************************************************/
 {
@@ -205,10 +206,6 @@
 		t1 = VAL_LEN(arg);
 
 		mt = MIN(t0, t1); // smaller array size
-		// For AND - result is size of shortest input:
-//		if (action == A_AND || (action == 0 && t1 >= t0))
-//			t2 = mt;
-//		else
 		t2 = MAX(t0, t1);
 
 		series = Make_Binary(t2);
@@ -238,6 +235,59 @@
 		return series;
 }
 
+/***********************************************************************
+**
+*/  REBSER *Xandor_Binary(REBCNT action, REBVAL *value, REBVAL *arg)
+/*
+**		Only valid for BINARY data.
+**
+***********************************************************************/
+{
+	REBSER *series;
+	REBYTE *p0, *p1, *p2;
+	REBCNT i, j, mt, t1, t0, t2;
+
+	t0 = VAL_LEN(value);
+	t1 = VAL_LEN(arg);
+
+	if (t0 >= t1) {
+		mt = t1;
+		t2 = t0;
+		p0 = VAL_BIN_DATA(value);
+		p1 = VAL_BIN_DATA(arg);
+	}
+	else {
+		mt = t0;
+		t2 = t1;
+		p1 = VAL_BIN_DATA(value);
+		p0 = VAL_BIN_DATA(arg);
+	}
+	series = Make_Binary(t2);
+	SERIES_TAIL(series) = t2;
+	p2 = BIN_HEAD(series);
+
+	switch (action) {
+	case A_AND:
+		for (i = 0, j = 0; j <= t2; i++, j++) {
+			if (i == mt) i = 0;
+			p2[j] = p0[j] & p1[i];
+		}
+		break;
+	case A_OR:
+		for (i = 0, j = 0; j <= t2; i++, j++) {
+			if (i == mt) i = 0;
+			p2[j] = p0[j] | p1[i];
+		}
+		break;
+	case A_XOR:
+		for (i = 0, j = 0; j <= t2; i++, j++) {
+			if (i == mt) i = 0;
+			p2[j] = p0[j] ^ p1[i];
+		}
+		break;
+	}
+	return series;
+}
 
 /***********************************************************************
 **

src/core/t-bitset.c

@@ -3,6 +3,7 @@
 **  REBOL [R3] Language Interpreter and Run-time Environment
 **
 **  Copyright 2012 REBOL Technologies
+**  Copyright 2012-2022 Rebol Open Source Developers
 **  REBOL is a trademark of REBOL Technologies
 **
 **  Licensed under the Apache License, Version 2.0 (the "License");
@@ -740,7 +741,7 @@
 	case A_XOR:
 		if (!IS_BITSET(arg) && !IS_BINARY(arg))
 			Trap_Math_Args(VAL_TYPE(arg), action);
-		VAL_SERIES(value) = ser = Xandor_Binary(action, value, arg);
+		VAL_SERIES(value) = ser = Xandor_Bitset(action, value, arg);
 		Trim_Tail_Zeros(ser);
 		break;
 

src/modules/httpd.reb

@@ -34,7 +34,7 @@ Rebol [
 		10-May-2020 "Oldes" {Implemented directory listing, logging and multipart POST processing}
 		02-Jul-2020 "Oldes" {Added possibility to stop server and return data from client (useful for OAuth2)}
 	]
-	needs: [mime-types]
+	needs: [3.10.1 mime-types]
 ]
 
 append system/options/log [httpd: 1]
@@ -755,10 +755,7 @@ sys/make-scheme [
 						either mask? [
 							request-data: make binary! len
 							masks:   take/part data 4
-							payload: take/part data len
-							while [not tail? payload][
-								append request-data masks xor take/part payload 4
-							]
+							request-data: masks xor take/part data len
 						][
 							request-data: take/part data len
 						]

src/tests/units/series-test.r3

@@ -2306,6 +2306,23 @@ Rebol [
 
 ===end-group===
 
+
+===start-group=== "Bitwise operations on binary"	
+	bin1: #{DEADBEAFF00D}
+	bin2: #{BEAF}
+	--test-- "AND on binary"
+	--assert (bin1 AND bin2) == #{9EADBEAFB00D}
+	--assert (bin2 AND bin1) == #{9EADBEAFB00D}
+	--test-- "OR on binary"
+	--assert (bin1 OR bin2)  == #{FEAFBEAFFEAF}
+	--assert (bin2 OR bin1)  == #{FEAFBEAFFEAF}
+	--test-- "XOR on binary"
+	--assert (bin1 XOR bin2) == #{600200004EA2}
+	--assert (bin2 XOR bin1) == #{600200004EA2}
+	--assert (#{600200004EA2} XOR bin2) == bin1
+===end-group===
+
+
 ===start-group=== "TO-*"
 
 --test-- "to-path"