separate squeeze to its own file
This commit is contained in:
parent
a3d6301210
commit
e31c574fd8
2
makefile
2
makefile
@ -192,7 +192,7 @@ ${bd}/%.o: src/jit/%.c
|
||||
@echo $< | cut -c 5-
|
||||
@$(CC_INC) $@.d -o $@ -c $<
|
||||
|
||||
builtins: ${addprefix ${bd}/, arithm.o arithd.o cmp.o sfns.o select.o sort.o md1.o md2.o fns.o sysfn.o internal.o inverse.o}
|
||||
builtins: ${addprefix ${bd}/, arithm.o arithd.o cmp.o sfns.o squeeze.o select.o sort.o md1.o md2.o fns.o sysfn.o internal.o inverse.o}
|
||||
${bd}/%.o: src/builtins/%.c
|
||||
@echo $< | cut -c 5-
|
||||
@$(CC_INC) $@.d -o $@ -c $<
|
||||
|
||||
139
src/builtins/squeeze.c
Normal file
139
src/builtins/squeeze.c
Normal file
@ -0,0 +1,139 @@
|
||||
#include "../core.h"
|
||||
|
||||
FORCE_INLINE B num_squeeze_choose(B x, u32 or) {
|
||||
if (or==0) goto r_bit;
|
||||
else if (or<=(u32)I8_MAX ) goto r_i8;
|
||||
else if (or<=(u32)I16_MAX) goto r_i16;
|
||||
else goto r_i32;
|
||||
|
||||
r_bit: return FL_SET(taga(toBitArr(x)), fl_squoze);
|
||||
r_i8 : return FL_SET(toI8Any (x), fl_squoze);
|
||||
r_i16: return FL_SET(toI16Any(x), fl_squoze);
|
||||
r_i32: return FL_SET(toI32Any(x), fl_squoze);
|
||||
}
|
||||
NOINLINE B num_squeezeF(B x, usz ia) {
|
||||
u32 or = 0;
|
||||
usz i = 0;
|
||||
SGetU(x)
|
||||
for (; i < ia; i++) {
|
||||
B cr = GetU(x,i);
|
||||
if (RARE(!q_i32(cr))) {
|
||||
while (i<ia) if (!isF64(GetU(x,i++))) return FL_SET(x, fl_squoze);
|
||||
return FL_SET(toF64Any(x), fl_squoze);
|
||||
}
|
||||
i32 c = o2iu(cr);
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
return num_squeeze_choose(x, or);
|
||||
}
|
||||
B num_squeeze(B x) {
|
||||
usz ia = a(x)->ia;
|
||||
u8 xe = TI(x,elType);
|
||||
|
||||
usz i = 0;
|
||||
|
||||
u32 or = 0; // using bitwise or as an approximate ⌈´
|
||||
switch (xe) { default: UD;
|
||||
case el_bit: goto r_x;
|
||||
case el_i8: { i8* xp = i8any_ptr (x); for (; i < ia; i++) { i32 c = xp[i]; or|= (u8)c; } goto r_orI8; }
|
||||
case el_i16: { i16* xp = i16any_ptr(x); for (; i < ia; i++) { i32 c = xp[i]; or|= ((u32)c & ~1) ^ (u32)(c>>31); } goto r_or; }
|
||||
case el_i32: { i32* xp = i32any_ptr(x); for (; i < ia; i++) { i32 c = xp[i]; or|= ((u32)c & ~1) ^ (u32)(c>>31); } goto r_or; }
|
||||
case el_f64: {
|
||||
f64* xp = f64any_ptr(x);
|
||||
for (; i < ia; i++) {
|
||||
f64 cf = xp[i];
|
||||
i32 c = (i32)cf;
|
||||
if (c!=cf) goto r_x; // already f64
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
goto r_or;
|
||||
}
|
||||
case el_B: case el_c8: case el_c16: case el_c32:; /*fallthrough*/
|
||||
}
|
||||
|
||||
B* xp = arr_bptr(x);
|
||||
if (xp==NULL) return num_squeezeF(x, ia);
|
||||
for (; i < ia; i++) {
|
||||
if (RARE(!q_i32(xp[i]))) {
|
||||
while (i<ia) if (!isF64(xp[i++])) goto r_x;
|
||||
goto r_f64;
|
||||
}
|
||||
i32 c = o2iu(xp[i]);
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
goto r_or;
|
||||
|
||||
r_or : return num_squeeze_choose(x, or);
|
||||
r_x : return FL_SET(x, fl_squoze);
|
||||
r_f64 : return FL_SET(toF64Any(x), fl_squoze);
|
||||
r_orI8 : if (or>=2) goto r_x; else goto r_i8;
|
||||
r_i8 : return FL_SET(toI8Any (x), fl_squoze);
|
||||
}
|
||||
B chr_squeeze(B x) {
|
||||
usz ia = a(x)->ia;
|
||||
u8 xe = TI(x,elType);
|
||||
if (xe==el_c8) goto r_x;
|
||||
usz i = 0;
|
||||
i32 or = 0;
|
||||
if (xe==el_c16) {
|
||||
u16* xp = c16any_ptr(x);
|
||||
for (; i < ia; i++) if (xp[i] != (u8)xp[i]) goto r_x;
|
||||
goto r_c8;
|
||||
}
|
||||
if (xe==el_c32) {
|
||||
u32* xp = c32any_ptr(x);
|
||||
bool c8 = true;
|
||||
for (; i < ia; i++) {
|
||||
if (xp[i] != (u16)xp[i]) goto r_c32;
|
||||
if (xp[i] != (u8 )xp[i]) c8 = false;
|
||||
}
|
||||
if (c8) goto r_c8;
|
||||
else goto r_c16;
|
||||
}
|
||||
|
||||
B* xp = arr_bptr(x);
|
||||
if (xp!=NULL) {
|
||||
for (; i < ia; i++) {
|
||||
if (!isC32(xp[i])) goto r_x;
|
||||
or|= o2cu(xp[i]);
|
||||
}
|
||||
} else {
|
||||
SGetU(x)
|
||||
for (; i < ia; i++) {
|
||||
B cr = GetU(x,i);
|
||||
if (!isC32(cr)) goto r_x;
|
||||
or|= o2cu(cr);
|
||||
}
|
||||
}
|
||||
if (or<=U8_MAX ) r_c8: return FL_SET(toC8Any(x), fl_squoze);
|
||||
else if (or<=U16_MAX) r_c16: return FL_SET(toC16Any(x), fl_squoze);
|
||||
else r_c32: return FL_SET(toC32Any(x), fl_squoze);
|
||||
r_x: return FL_SET(x, fl_squoze);
|
||||
}
|
||||
|
||||
B any_squeeze(B x) {
|
||||
assert(isArr(x));
|
||||
if (FL_HAS(x,fl_squoze)) return x;
|
||||
if (a(x)->ia==0) return FL_SET(x, fl_squoze); // TODO return a version of the smallest type
|
||||
B x0 = IGetU(x, 0);
|
||||
if (isNum(x0)) return num_squeeze(x);
|
||||
else if (isC32(x0)) return chr_squeeze(x);
|
||||
return FL_SET(x, fl_squoze);
|
||||
}
|
||||
|
||||
B squeeze_deep(B x) {
|
||||
if (!isArr(x)) return x;
|
||||
x = any_squeeze(x);
|
||||
if (TI(x,elType)!=el_B) return x;
|
||||
usz ia = a(x)->ia;
|
||||
M_HARR(r, ia)
|
||||
B* xp = arr_bptr(x);
|
||||
B xf = getFillQ(x);
|
||||
if (xp!=NULL) {
|
||||
for (usz i=0; i<ia; i++) { HARR_ADD(r, i, squeeze_deep(inc(xp[i]))); }
|
||||
} else {
|
||||
SGet(x);
|
||||
for (usz i=0; i<ia; i++) { HARR_ADD(r, i, squeeze_deep(Get(x,i))); }
|
||||
}
|
||||
return any_squeeze(qWithFill(HARR_FCD(r, x), xf));
|
||||
}
|
||||
128
src/core/stuff.c
128
src/core/stuff.c
@ -601,134 +601,6 @@ bool isPureFn(B x) { // doesn't consume
|
||||
} else return isNum(x) || isC32(x);
|
||||
}
|
||||
|
||||
B num_squeeze(B x) {
|
||||
usz ia = a(x)->ia;
|
||||
u8 xe = TI(x,elType);
|
||||
usz i = 0;
|
||||
u32 or = 0; // using bitwise or as an approximate ⌈´
|
||||
switch (xe) { default: UD;
|
||||
case el_bit: goto r_x;
|
||||
case el_i8: { i8* xp = i8any_ptr (x); for (; i < ia; i++) { i32 c = xp[i]; or|= ((u32)c & ~1) ^ (u32)(c>>31); } goto r_or; }
|
||||
case el_i16: { i16* xp = i16any_ptr(x); for (; i < ia; i++) { i32 c = xp[i]; or|= ((u32)c & ~1) ^ (u32)(c>>31); } goto r_or; }
|
||||
case el_i32: { i32* xp = i32any_ptr(x); for (; i < ia; i++) { i32 c = xp[i]; or|= ((u32)c & ~1) ^ (u32)(c>>31); } goto r_or; }
|
||||
case el_f64: {
|
||||
f64* xp = f64any_ptr(x);
|
||||
for (; i < ia; i++) {
|
||||
f64 cf = xp[i];
|
||||
i32 c = (i32)cf;
|
||||
if (c!=cf) goto r_x; // already f64
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
goto r_or;
|
||||
}
|
||||
case el_B: case el_c8: case el_c16: case el_c32:; /*fallthrough*/
|
||||
}
|
||||
|
||||
B* xp = arr_bptr(x);
|
||||
if (xp!=NULL) {
|
||||
for (; i < ia; i++) {
|
||||
if (RARE(!q_i32(xp[i]))) {
|
||||
while (i<ia) if (!isF64(xp[i++])) goto r_x;
|
||||
goto r_f64;
|
||||
}
|
||||
i32 c = o2iu(xp[i]);
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
goto r_or;
|
||||
}
|
||||
|
||||
SGetU(x)
|
||||
for (; i < ia; i++) {
|
||||
B cr = GetU(x,i);
|
||||
if (RARE(!q_i32(cr))) {
|
||||
while (i<ia) if (!isF64(GetU(x,i++))) goto r_x;
|
||||
goto r_f64;
|
||||
}
|
||||
i32 c = o2iu(cr);
|
||||
or|= ((u32)c & ~1) ^ (u32)(c>>31);
|
||||
}
|
||||
r_or:
|
||||
if (or==0) goto r_bit;
|
||||
else if (or<=(u32)I8_MAX ) goto r_i8;
|
||||
else if (or<=(u32)I16_MAX) goto r_i16;
|
||||
else goto r_i32;
|
||||
|
||||
r_x : return FL_SET(x, fl_squoze);
|
||||
r_bit: return FL_SET(taga(toBitArr(x)), fl_squoze);
|
||||
r_i8 : return FL_SET(toI8Any (x), fl_squoze);
|
||||
r_i16: return FL_SET(toI16Any(x), fl_squoze);
|
||||
r_i32: return FL_SET(toI32Any(x), fl_squoze);
|
||||
r_f64: return FL_SET(toF64Any(x), fl_squoze);
|
||||
}
|
||||
B chr_squeeze(B x) {
|
||||
usz ia = a(x)->ia;
|
||||
u8 xe = TI(x,elType);
|
||||
if (xe==el_c8) goto r_x;
|
||||
usz i = 0;
|
||||
i32 or = 0;
|
||||
if (xe==el_c16) {
|
||||
u16* xp = c16any_ptr(x);
|
||||
for (; i < ia; i++) if (xp[i] != (u8)xp[i]) goto r_x;
|
||||
goto r_c8;
|
||||
}
|
||||
if (xe==el_c32) {
|
||||
u32* xp = c32any_ptr(x);
|
||||
bool c8 = true;
|
||||
for (; i < ia; i++) {
|
||||
if (xp[i] != (u16)xp[i]) goto r_c32;
|
||||
if (xp[i] != (u8 )xp[i]) c8 = false;
|
||||
}
|
||||
if (c8) goto r_c8;
|
||||
else goto r_c16;
|
||||
}
|
||||
|
||||
B* xp = arr_bptr(x);
|
||||
if (xp!=NULL) {
|
||||
for (; i < ia; i++) {
|
||||
if (!isC32(xp[i])) goto r_x;
|
||||
or|= o2cu(xp[i]);
|
||||
}
|
||||
} else {
|
||||
SGetU(x)
|
||||
for (; i < ia; i++) {
|
||||
B cr = GetU(x,i);
|
||||
if (!isC32(cr)) goto r_x;
|
||||
or|= o2cu(cr);
|
||||
}
|
||||
}
|
||||
if (or<=U8_MAX ) r_c8: return FL_SET(toC8Any(x), fl_squoze);
|
||||
else if (or<=U16_MAX) r_c16: return FL_SET(toC16Any(x), fl_squoze);
|
||||
else r_c32: return FL_SET(toC32Any(x), fl_squoze);
|
||||
r_x: return FL_SET(x, fl_squoze);
|
||||
}
|
||||
|
||||
B any_squeeze(B x) {
|
||||
assert(isArr(x));
|
||||
if (FL_HAS(x,fl_squoze)) return x;
|
||||
if (a(x)->ia==0) return FL_SET(x, fl_squoze); // TODO return a version of the smallest type
|
||||
B x0 = IGetU(x, 0);
|
||||
if (isNum(x0)) return num_squeeze(x);
|
||||
else if (isC32(x0)) return chr_squeeze(x);
|
||||
return FL_SET(x, fl_squoze);
|
||||
}
|
||||
|
||||
B squeeze_deep(B x) {
|
||||
if (!isArr(x)) return x;
|
||||
x = any_squeeze(x);
|
||||
if (TI(x,elType)!=el_B) return x;
|
||||
usz ia = a(x)->ia;
|
||||
M_HARR(r, ia)
|
||||
B* xp = arr_bptr(x);
|
||||
B xf = getFillQ(x);
|
||||
if (xp!=NULL) {
|
||||
for (usz i=0; i<ia; i++) { HARR_ADD(r, i, squeeze_deep(inc(xp[i]))); }
|
||||
} else {
|
||||
SGet(x);
|
||||
for (usz i=0; i<ia; i++) { HARR_ADD(r, i, squeeze_deep(Get(x,i))); }
|
||||
}
|
||||
return any_squeeze(qWithFill(HARR_FCD(r, x), xf));
|
||||
}
|
||||
|
||||
B bqn_merge(B x) {
|
||||
assert(isArr(x));
|
||||
usz xia = a(x)->ia;
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
#include "../builtins/md2.c"
|
||||
#include "../builtins/internal.c"
|
||||
#include "../builtins/inverse.c"
|
||||
#include "../builtins/squeeze.c"
|
||||
#include "../vm.c"
|
||||
#include "../ns.c"
|
||||
#include "../nfns.c"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user