mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-20 01:08:15 +01:00
Update MicroPython from 1.12 to 1.17
This commit is contained in:
Yaya.Cout
@@ -46,24 +46,40 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
|
||||
size_t size = 0;
|
||||
int align = 1;
|
||||
switch (struct_type) {
|
||||
case '<': case '>':
|
||||
case '<':
|
||||
case '>':
|
||||
switch (val_type) {
|
||||
case 'b': case 'B':
|
||||
size = 1; break;
|
||||
case 'h': case 'H':
|
||||
size = 2; break;
|
||||
case 'i': case 'I':
|
||||
size = 4; break;
|
||||
case 'l': case 'L':
|
||||
size = 4; break;
|
||||
case 'q': case 'Q':
|
||||
size = 8; break;
|
||||
case 'P': case 'O': case 'S':
|
||||
size = sizeof(void*); break;
|
||||
case 'b':
|
||||
case 'B':
|
||||
size = 1;
|
||||
break;
|
||||
case 'h':
|
||||
case 'H':
|
||||
size = 2;
|
||||
break;
|
||||
case 'i':
|
||||
case 'I':
|
||||
size = 4;
|
||||
break;
|
||||
case 'l':
|
||||
case 'L':
|
||||
size = 4;
|
||||
break;
|
||||
case 'q':
|
||||
case 'Q':
|
||||
size = 8;
|
||||
break;
|
||||
case 'P':
|
||||
case 'O':
|
||||
case 'S':
|
||||
size = sizeof(void *);
|
||||
break;
|
||||
case 'f':
|
||||
size = sizeof(float); break;
|
||||
size = sizeof(float);
|
||||
break;
|
||||
case 'd':
|
||||
size = sizeof(double); break;
|
||||
size = sizeof(double);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case '@': {
|
||||
@@ -76,35 +92,50 @@ size_t mp_binary_get_size(char struct_type, char val_type, size_t *palign) {
|
||||
// particular (or any) ABI.
|
||||
switch (val_type) {
|
||||
case BYTEARRAY_TYPECODE:
|
||||
case 'b': case 'B':
|
||||
align = size = 1; break;
|
||||
case 'h': case 'H':
|
||||
case 'b':
|
||||
case 'B':
|
||||
align = size = 1;
|
||||
break;
|
||||
case 'h':
|
||||
case 'H':
|
||||
align = alignof(short);
|
||||
size = sizeof(short); break;
|
||||
case 'i': case 'I':
|
||||
size = sizeof(short);
|
||||
break;
|
||||
case 'i':
|
||||
case 'I':
|
||||
align = alignof(int);
|
||||
size = sizeof(int); break;
|
||||
case 'l': case 'L':
|
||||
size = sizeof(int);
|
||||
break;
|
||||
case 'l':
|
||||
case 'L':
|
||||
align = alignof(long);
|
||||
size = sizeof(long); break;
|
||||
case 'q': case 'Q':
|
||||
size = sizeof(long);
|
||||
break;
|
||||
case 'q':
|
||||
case 'Q':
|
||||
align = alignof(long long);
|
||||
size = sizeof(long long); break;
|
||||
case 'P': case 'O': case 'S':
|
||||
align = alignof(void*);
|
||||
size = sizeof(void*); break;
|
||||
size = sizeof(long long);
|
||||
break;
|
||||
case 'P':
|
||||
case 'O':
|
||||
case 'S':
|
||||
align = alignof(void *);
|
||||
size = sizeof(void *);
|
||||
break;
|
||||
case 'f':
|
||||
align = alignof(float);
|
||||
size = sizeof(float); break;
|
||||
size = sizeof(float);
|
||||
break;
|
||||
case 'd':
|
||||
align = alignof(double);
|
||||
size = sizeof(double); break;
|
||||
size = sizeof(double);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (size == 0) {
|
||||
mp_raise_ValueError("bad typecode");
|
||||
mp_raise_ValueError(MP_ERROR_TEXT("bad typecode"));
|
||||
}
|
||||
|
||||
if (palign != NULL) {
|
||||
@@ -117,44 +148,44 @@ mp_obj_t mp_binary_get_val_array(char typecode, void *p, size_t index) {
|
||||
mp_int_t val = 0;
|
||||
switch (typecode) {
|
||||
case 'b':
|
||||
val = ((signed char*)p)[index];
|
||||
val = ((signed char *)p)[index];
|
||||
break;
|
||||
case BYTEARRAY_TYPECODE:
|
||||
case 'B':
|
||||
val = ((unsigned char*)p)[index];
|
||||
val = ((unsigned char *)p)[index];
|
||||
break;
|
||||
case 'h':
|
||||
val = ((short*)p)[index];
|
||||
val = ((short *)p)[index];
|
||||
break;
|
||||
case 'H':
|
||||
val = ((unsigned short*)p)[index];
|
||||
val = ((unsigned short *)p)[index];
|
||||
break;
|
||||
case 'i':
|
||||
return mp_obj_new_int(((int*)p)[index]);
|
||||
return mp_obj_new_int(((int *)p)[index]);
|
||||
case 'I':
|
||||
return mp_obj_new_int_from_uint(((unsigned int*)p)[index]);
|
||||
return mp_obj_new_int_from_uint(((unsigned int *)p)[index]);
|
||||
case 'l':
|
||||
return mp_obj_new_int(((long*)p)[index]);
|
||||
return mp_obj_new_int(((long *)p)[index]);
|
||||
case 'L':
|
||||
return mp_obj_new_int_from_uint(((unsigned long*)p)[index]);
|
||||
return mp_obj_new_int_from_uint(((unsigned long *)p)[index]);
|
||||
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
|
||||
case 'q':
|
||||
return mp_obj_new_int_from_ll(((long long*)p)[index]);
|
||||
return mp_obj_new_int_from_ll(((long long *)p)[index]);
|
||||
case 'Q':
|
||||
return mp_obj_new_int_from_ull(((unsigned long long*)p)[index]);
|
||||
return mp_obj_new_int_from_ull(((unsigned long long *)p)[index]);
|
||||
#endif
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
case 'f':
|
||||
return mp_obj_new_float(((float*)p)[index]);
|
||||
return mp_obj_new_float_from_f(((float *)p)[index]);
|
||||
case 'd':
|
||||
return mp_obj_new_float(((double*)p)[index]);
|
||||
#endif
|
||||
return mp_obj_new_float_from_d(((double *)p)[index]);
|
||||
#endif
|
||||
// Extension to CPython: array of objects
|
||||
case 'O':
|
||||
return ((mp_obj_t*)p)[index];
|
||||
return ((mp_obj_t *)p)[index];
|
||||
// Extension to CPython: array of pointers
|
||||
case 'P':
|
||||
return mp_obj_new_int((mp_int_t)(uintptr_t)((void**)p)[index]);
|
||||
return mp_obj_new_int((mp_int_t)(uintptr_t)((void **)p)[index]);
|
||||
}
|
||||
return MP_OBJ_NEW_SMALL_INT(val);
|
||||
}
|
||||
@@ -171,7 +202,7 @@ long long mp_binary_get_int(size_t size, bool is_signed, bool big_endian, const
|
||||
delta = 1;
|
||||
}
|
||||
|
||||
long long val = 0;
|
||||
unsigned long long val = 0;
|
||||
if (is_signed && *src & 0x80) {
|
||||
val = -1;
|
||||
}
|
||||
@@ -206,16 +237,20 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
|
||||
if (val_type == 'O') {
|
||||
return (mp_obj_t)(mp_uint_t)val;
|
||||
} else if (val_type == 'S') {
|
||||
const char *s_val = (const char*)(uintptr_t)(mp_uint_t)val;
|
||||
const char *s_val = (const char *)(uintptr_t)(mp_uint_t)val;
|
||||
return mp_obj_new_str(s_val, strlen(s_val));
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
} else if (val_type == 'f') {
|
||||
union { uint32_t i; float f; } fpu = {val};
|
||||
return mp_obj_new_float(fpu.f);
|
||||
union { uint32_t i;
|
||||
float f;
|
||||
} fpu = {val};
|
||||
return mp_obj_new_float_from_f(fpu.f);
|
||||
} else if (val_type == 'd') {
|
||||
union { uint64_t i; double f; } fpu = {val};
|
||||
return mp_obj_new_float(fpu.f);
|
||||
#endif
|
||||
union { uint64_t i;
|
||||
double f;
|
||||
} fpu = {val};
|
||||
return mp_obj_new_float_from_d(fpu.f);
|
||||
#endif
|
||||
} else if (is_signed(val_type)) {
|
||||
if ((long long)MP_SMALL_INT_MIN <= val && val <= (long long)MP_SMALL_INT_MAX) {
|
||||
return mp_obj_new_int((mp_int_t)val);
|
||||
@@ -236,13 +271,13 @@ void mp_binary_set_int(size_t val_sz, bool big_endian, byte *dest, mp_uint_t val
|
||||
memcpy(dest, &val, val_sz);
|
||||
} else if (MP_ENDIANNESS_BIG && big_endian) {
|
||||
// only copy the least-significant val_sz bytes
|
||||
memcpy(dest, (byte*)&val + sizeof(mp_uint_t) - val_sz, val_sz);
|
||||
memcpy(dest, (byte *)&val + sizeof(mp_uint_t) - val_sz, val_sz);
|
||||
} else {
|
||||
const byte *src;
|
||||
if (MP_ENDIANNESS_LITTLE) {
|
||||
src = (const byte*)&val + val_sz;
|
||||
src = (const byte *)&val + val_sz;
|
||||
} else {
|
||||
src = (const byte*)&val + sizeof(mp_uint_t);
|
||||
src = (const byte *)&val + sizeof(mp_uint_t);
|
||||
}
|
||||
while (val_sz--) {
|
||||
*dest++ = *--src;
|
||||
@@ -271,17 +306,22 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
|
||||
case 'O':
|
||||
val = (mp_uint_t)val_in;
|
||||
break;
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
case 'f': {
|
||||
union { uint32_t i; float f; } fp_sp;
|
||||
fp_sp.f = mp_obj_get_float(val_in);
|
||||
union { uint32_t i;
|
||||
float f;
|
||||
} fp_sp;
|
||||
fp_sp.f = mp_obj_get_float_to_f(val_in);
|
||||
val = fp_sp.i;
|
||||
break;
|
||||
}
|
||||
case 'd': {
|
||||
union { uint64_t i64; uint32_t i32[2]; double f; } fp_dp;
|
||||
fp_dp.f = mp_obj_get_float(val_in);
|
||||
if (BYTES_PER_WORD == 8) {
|
||||
union { uint64_t i64;
|
||||
uint32_t i32[2];
|
||||
double f;
|
||||
} fp_dp;
|
||||
fp_dp.f = mp_obj_get_float_to_d(val_in);
|
||||
if (MP_BYTES_PER_OBJ_WORD == 8) {
|
||||
val = fp_dp.i64;
|
||||
} else {
|
||||
int be = struct_type == '>';
|
||||
@@ -291,25 +331,25 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
|
||||
}
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
default:
|
||||
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
|
||||
if (mp_obj_is_type(val_in, &mp_type_int)) {
|
||||
mp_obj_int_to_bytes_impl(val_in, struct_type == '>', size, p);
|
||||
return;
|
||||
} else
|
||||
}
|
||||
#endif
|
||||
{
|
||||
val = mp_obj_get_int(val_in);
|
||||
// zero/sign extend if needed
|
||||
if (BYTES_PER_WORD < 8 && size > sizeof(val)) {
|
||||
int c = (is_signed(val_type) && (mp_int_t)val < 0) ? 0xff : 0x00;
|
||||
memset(p, c, size);
|
||||
if (struct_type == '>') {
|
||||
p += size - sizeof(val);
|
||||
}
|
||||
|
||||
val = mp_obj_get_int(val_in);
|
||||
// zero/sign extend if needed
|
||||
if (MP_BYTES_PER_OBJ_WORD < 8 && size > sizeof(val)) {
|
||||
int c = (mp_int_t)val < 0 ? 0xff : 0x00;
|
||||
memset(p, c, size);
|
||||
if (struct_type == '>') {
|
||||
p += size - sizeof(val);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
mp_binary_set_int(MIN((size_t)size, sizeof(val)), struct_type == '>', p, val);
|
||||
@@ -317,24 +357,24 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
|
||||
|
||||
void mp_binary_set_val_array(char typecode, void *p, size_t index, mp_obj_t val_in) {
|
||||
switch (typecode) {
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
case 'f':
|
||||
((float*)p)[index] = mp_obj_get_float(val_in);
|
||||
((float *)p)[index] = mp_obj_get_float_to_f(val_in);
|
||||
break;
|
||||
case 'd':
|
||||
((double*)p)[index] = mp_obj_get_float(val_in);
|
||||
((double *)p)[index] = mp_obj_get_float_to_d(val_in);
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
// Extension to CPython: array of objects
|
||||
case 'O':
|
||||
((mp_obj_t*)p)[index] = val_in;
|
||||
((mp_obj_t *)p)[index] = val_in;
|
||||
break;
|
||||
default:
|
||||
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
|
||||
if (mp_obj_is_type(val_in, &mp_type_int)) {
|
||||
size_t size = mp_binary_get_size('@', typecode, NULL);
|
||||
mp_obj_int_to_bytes_impl(val_in, MP_ENDIANNESS_BIG,
|
||||
size, (uint8_t*)p + index * size);
|
||||
size, (uint8_t *)p + index * size);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
@@ -345,49 +385,49 @@ void mp_binary_set_val_array(char typecode, void *p, size_t index, mp_obj_t val_
|
||||
void mp_binary_set_val_array_from_int(char typecode, void *p, size_t index, mp_int_t val) {
|
||||
switch (typecode) {
|
||||
case 'b':
|
||||
((signed char*)p)[index] = val;
|
||||
((signed char *)p)[index] = val;
|
||||
break;
|
||||
case BYTEARRAY_TYPECODE:
|
||||
case 'B':
|
||||
((unsigned char*)p)[index] = val;
|
||||
((unsigned char *)p)[index] = val;
|
||||
break;
|
||||
case 'h':
|
||||
((short*)p)[index] = val;
|
||||
((short *)p)[index] = val;
|
||||
break;
|
||||
case 'H':
|
||||
((unsigned short*)p)[index] = val;
|
||||
((unsigned short *)p)[index] = val;
|
||||
break;
|
||||
case 'i':
|
||||
((int*)p)[index] = val;
|
||||
((int *)p)[index] = val;
|
||||
break;
|
||||
case 'I':
|
||||
((unsigned int*)p)[index] = val;
|
||||
((unsigned int *)p)[index] = val;
|
||||
break;
|
||||
case 'l':
|
||||
((long*)p)[index] = val;
|
||||
((long *)p)[index] = val;
|
||||
break;
|
||||
case 'L':
|
||||
((unsigned long*)p)[index] = val;
|
||||
((unsigned long *)p)[index] = val;
|
||||
break;
|
||||
#if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
|
||||
case 'q':
|
||||
((long long*)p)[index] = val;
|
||||
((long long *)p)[index] = val;
|
||||
break;
|
||||
case 'Q':
|
||||
((unsigned long long*)p)[index] = val;
|
||||
((unsigned long long *)p)[index] = val;
|
||||
break;
|
||||
#endif
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
#if MICROPY_PY_BUILTINS_FLOAT
|
||||
case 'f':
|
||||
((float*)p)[index] = val;
|
||||
((float *)p)[index] = (float)val;
|
||||
break;
|
||||
case 'd':
|
||||
((double*)p)[index] = val;
|
||||
((double *)p)[index] = (double)val;
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
// Extension to CPython: array of pointers
|
||||
case 'P':
|
||||
((void**)p)[index] = (void*)(uintptr_t)val;
|
||||
((void **)p)[index] = (void *)(uintptr_t)val;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user