Skip to content

Commit

Permalink
FEAT: BinCode - added commands: F16LE, F16BE, F32LE, F32BE, `…
Browse files Browse the repository at this point in the history 
…F64LE` and `F64BE`
  • Loading branch information
@Oldes
Oldes committed Dec 7, 2021
1 parent 34e0e2c commit fa46cb4
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 86 deletions.
199 changes: 114 additions & 85 deletions src/core/u-bincode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,29 @@ typedef union {
} while (0)
#define STORE_IN_BIT(val, inBit) SET_INT32(VAL_OBJ_VALUE(val, BINCODE_READ_BITMASK), inBit);

#ifdef ENDIAN_LITTLE
#define WRITE_BE_2(cp, bp) cp[0] = bp[1]; cp[1] = bp[0];
#define WRITE_BE_3(cp, bp) cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#define WRITE_BE_4(cp, bp) cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#define WRITE_BE_8(cp, bp) cp[0] = bp[7]; cp[1] = bp[6]; cp[2] = bp[5]; cp[3] = bp[4]; \
cp[4] = bp[3]; cp[5] = bp[2]; cp[6] = bp[1]; cp[7] = bp[0];
#define WRITE_LE_2(cp, bp) memcpy(cp, bp, 2);
#define WRITE_LE_3(cp, bp) memcpy(cp, bp, 3);
#define WRITE_LE_4(cp, bp) memcpy(cp, bp, 4);
#define WRITE_LE_8(cp, bp) memcpy(cp, bp, 8);
#else
#define WRITE_BE_2(cp, bp) memcpy(cp, bp, 2);
#define WRITE_BE_3(cp, bp) memcpy(cp, bp, 3);
#define WRITE_BE_4(cp, bp) memcpy(cp, bp, 4);
#define WRITE_BE_8(cp, bp) memcpy(cp, bp, 8);
#define WRITE_LE_2(cp, bp) cp[0] = bp[1]; cp[1] = bp[0];
#define WRITE_LE_3(cp, bp) cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#define WRITE_LE_4(cp, bp) cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#define WRITE_LE_8(cp, bp) cp[0] = bp[7]; cp[1] = bp[6]; cp[2] = bp[5]; cp[3] = bp[4]; \
cp[4] = bp[3]; cp[5] = bp[2]; cp[6] = bp[1]; cp[7] = bp[0];

#endif

//**********************************************************************
//MUST be in order like the values in system/standard/bincode object bellow!!!
enum BincodeContextValues {
Expand Down Expand Up @@ -247,6 +270,7 @@ static REBCNT EncodedU32_Size(u32 value) {
u16 ushort;
float16_s f16;
float32_s f32;
REBYTE buf[8];


ms_datetime* msdt = NULL;
Expand Down Expand Up @@ -531,18 +555,27 @@ static REBCNT EncodedU32_Size(u32 value) {
goto error;

case SYM_FLOAT:
case SYM_F32:
case SYM_F32LE:
case SYM_F32BE:
if (IS_INTEGER(next) || IS_DECIMAL(next)) {
count += 4;
continue;
}
goto error;
case SYM_DOUBLE:
case SYM_F64:
case SYM_F64LE:
case SYM_F64BE:
if (IS_INTEGER(next) || IS_DECIMAL(next)) {
count += 8;
continue;
}
goto error;
case SYM_FLOAT16:
case SYM_F16:
case SYM_F16LE:
case SYM_F16BE:
if (IS_INTEGER(next) || IS_DECIMAL(next)) {
count += 2;
continue;
Expand Down Expand Up @@ -674,11 +707,7 @@ static REBCNT EncodedU32_Size(u32 value) {
n = 2;
i = VAL_INT32(next);
bp = (REBYTE*)&i;
#ifdef ENDIAN_LITTLE
cp[0] = bp[1]; cp[1] = bp[0];
#else
memcpy(cp, bp, 2);
#endif
WRITE_BE_2(cp, bp);
break;
case SYM_UI24:
case SYM_UI24BE:
Expand All @@ -687,75 +716,45 @@ static REBCNT EncodedU32_Size(u32 value) {
n = 3;
i = VAL_INT32(next);
bp = (REBYTE*)&i;
#ifdef ENDIAN_LITTLE
cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#else
memcpy(cp, bp, 3);
#endif
WRITE_BE_3(cp, bp);
break;
case SYM_UI32:
case SYM_UI32BE:
ASSERT_U32_RANGE(next);
write_ui32:
n = 4;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_LITTLE
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#else
memcpy(cp, bp, 4);
#endif
WRITE_BE_4(cp, bp);
break;
case SYM_UI64:
case SYM_UI64BE:
write_ui64:
n = 8;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_LITTLE
cp[0] = bp[7]; cp[1] = bp[6]; cp[2] = bp[5]; cp[3] = bp[4];
cp[4] = bp[3]; cp[5] = bp[2]; cp[6] = bp[1]; cp[7] = bp[0];
#else
memcpy(cp, bp, 8);
#endif
WRITE_BE_8(cp, bp);
break;
case SYM_UI16LE:
ASSERT_UI_RANGE(next, 0xFFFF);
n = 2;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_BIG
cp[0] = bp[1]; cp[1] = bp[0];
#else
memcpy(cp, bp, 2);
#endif
WRITE_LE_2(cp, bp);
break;
case SYM_UI24LE:
ASSERT_UI_RANGE(next, 0xFFFFFF);
n = 3;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_BIG
cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#else
memcpy(cp, bp, 3);
#endif
WRITE_LE_3(cp, bp);
break;
case SYM_UI32LE:
ASSERT_U32_RANGE(next);
n = 4;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_BIG
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#else
memcpy(cp, bp, 4);
#endif
WRITE_LE_4(cp, bp);
break;
case SYM_UI64LE:
n = 8;
bp = (REBYTE*)&VAL_INT64(next);
#ifdef ENDIAN_LITTLE
memcpy(cp, bp, 8);
#else
cp[0] = bp[7]; cp[1] = bp[6]; cp[2] = bp[5]; cp[3] = bp[4];
cp[4] = bp[3]; cp[5] = bp[2]; cp[6] = bp[1]; cp[7] = bp[0];
#endif
WRITE_LE_8(cp, bp);
break;

case SYM_SI8:
Expand Down Expand Up @@ -786,23 +785,15 @@ static REBCNT EncodedU32_Size(u32 value) {
case SYM_UI16BEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
cp[0] = bp[1]; cp[1] = bp[0];
#else
memcpy(cp, bp, 2);
#endif
WRITE_BE_2(cp, bp);
cp+=2;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write)+=2; //for the length byte;
break;
case SYM_UI16LEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
memcpy(cp, bp, 2);
#else
cp[0] = bp[1]; cp[1] = bp[0];
#endif
WRITE_LE_2(cp, bp);
cp+=2;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write)+=2; //for the length byte;
Expand All @@ -812,23 +803,15 @@ static REBCNT EncodedU32_Size(u32 value) {
case SYM_UI24BEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#else
memcpy(cp, bp, 3);
#endif
WRITE_BE_3(cp, bp);
cp += 3;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write) += 3; //for the length byte;
break;
case SYM_UI24LEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
memcpy(cp, bp, 3);
#else
cp[0] = bp[2]; cp[1] = bp[1]; cp[2] = bp[0];
#endif
WRITE_LE_3(cp, bp);
cp += 3;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write) += 3; //for the length byte;
Expand All @@ -837,39 +820,52 @@ static REBCNT EncodedU32_Size(u32 value) {
case SYM_UI32BEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#else
memcpy(cp, bp, 4);
#endif
WRITE_BE_4(cp, bp);
cp += 4;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write) += 4; //for the length byte;
break;
case SYM_UI32LEBYTES:
n = VAL_LEN(next);
bp = (REBYTE*)&n;
#ifdef ENDIAN_LITTLE
memcpy(cp, bp, 4);
#else
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#endif
WRITE_LE_4(cp, bp);
cp += 4;
memcpy(cp, VAL_BIN_AT(next), n);
VAL_INDEX(buffer_write) += 4; //for the length byte;
break;

case SYM_FLOAT:
case SYM_F32:
case SYM_F32LE:
f32.v = (float)(IS_INTEGER(next) ? VAL_INT64(next) : VAL_DECIMAL(next));
bp = (REBYTE *)&f32;
WRITE_LE_4(cp, bp);
n = 4;
break;
case SYM_F32BE:
f32.v = (float)(IS_INTEGER(next) ? VAL_INT64(next) : VAL_DECIMAL(next));
memcpy(cp, (REBYTE*)&f32, 4);
bp = (REBYTE *)&f32;
WRITE_BE_4(cp, bp);
n = 4;
break;
case SYM_DOUBLE:
case SYM_F64:
case SYM_F64LE:
dbl = (REBDEC)(IS_INTEGER(next) ? VAL_INT64(next) : VAL_DECIMAL(next));
memcpy(cp, (REBYTE*)&dbl, 8);
n = 8;
bp = (REBYTE *)&dbl;
WRITE_LE_8(cp, bp);
break;
case SYM_F64BE:
dbl = (REBDEC)(IS_INTEGER(next) ? VAL_INT64(next) : VAL_DECIMAL(next));
n = 8;
bp = (REBYTE *)&dbl;
WRITE_BE_8(cp, bp);
break;
case SYM_FLOAT16:
case SYM_F16:
case SYM_F16BE:
case SYM_F16LE:
d32 = (REBDEC)(IS_INTEGER(next) ? VAL_INT64(next) : VAL_DECIMAL(next));
if (isnan(d32)) { // 1.#NaN
ushort = 0x7e00;
Expand All @@ -889,7 +885,13 @@ static REBCNT EncodedU32_Size(u32 value) {

ushort = (u16)t1;
}
memcpy(cp, (REBYTE*)&ushort, 2);
bp = (REBYTE *)&ushort;
if (cmd == SYM_F16BE) {
WRITE_BE_2(cp, bp);
}
else {
WRITE_LE_2(cp, bp);
}
n = 2;
break;

Expand Down Expand Up @@ -920,22 +922,14 @@ static REBCNT EncodedU32_Size(u32 value) {
n = 4;
i = (i32)time(NULL);
bp = (REBYTE*)&i;
#ifdef ENDIAN_LITTLE
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#else
memcpy(cp, bp, 4);
#endif
WRITE_BE_4(cp, bp);
break;
case SYM_UNIXTIME_NOW_LE:
value--; // no args
n = 4;
i = (i32)time(NULL);
bp = (REBYTE*)&i;
#ifdef ENDIAN_LITTLE
memcpy(cp, bp, 4);
#else
cp[0] = bp[3]; cp[1] = bp[2]; cp[2] = bp[1]; cp[3] = bp[0];
#endif
WRITE_LE_4(cp, bp);
break;

case SYM_MSDOS_DATE:
Expand Down Expand Up @@ -1516,22 +1510,57 @@ static REBCNT EncodedU32_Size(u32 value) {
Set_Tuple(temp, BIN_DATA(bin) + VAL_INDEX(buffer_read), n);
break;
case SYM_FLOAT16:
case SYM_F16:
case SYM_F16LE:
n = 2;
ASSERT_READ_SIZE(value, cp, ep, n);
f16.bytes.low = cp[0];
f16.bytes.high = cp[1];
SET_DECIMAL(temp, float16to32(f16) );
break;
case SYM_F16BE:
n = 2;
ASSERT_READ_SIZE(value, cp, ep, n);
f16.bytes.low = cp[1];
f16.bytes.high = cp[0];
SET_DECIMAL(temp, float16to32(f16));
break;
case SYM_FLOAT:
case SYM_F32:
case SYM_F32LE:
n = 4;
ASSERT_READ_SIZE(value, cp, ep, n);
SET_DECIMAL(temp, ((float*)cp)[0]);
break;
case SYM_F32BE:
n = 4;
ASSERT_READ_SIZE(value, cp, ep, n);
buf[0] = cp[3];
buf[1] = cp[2];
buf[2] = cp[1];
buf[3] = cp[0];
SET_DECIMAL(temp, ((float*)buf)[0]);
break;
case SYM_DOUBLE:
case SYM_F64:
case SYM_F64LE:
n = 8;
ASSERT_READ_SIZE(value, cp, ep, n);
SET_DECIMAL(temp, ((double*)cp)[0]);
break;
case SYM_F64BE:
n = 8;
ASSERT_READ_SIZE(value, cp, ep, n);
buf[0] = cp[7];
buf[1] = cp[6];
buf[2] = cp[5];
buf[3] = cp[4];
buf[4] = cp[3];
buf[5] = cp[2];
buf[6] = cp[1];
buf[7] = cp[0];
SET_DECIMAL(temp, ((double *)buf)[0]);
break;
case SYM_FIXED8:
n = 2;
ASSERT_READ_SIZE(value, cp, ep, n);
Expand Down
Loading

0 comments on commit fa46cb4

Please sign in to comment.