jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-19 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry prepare compilation on 64bits platforms (#21149)

Browse Source
This commit is contained in:
s-hadinger 2024-04-11 22:03:12 +02:00 committed by GitHub
parent d3ab3ced1e
commit 7e2fff9728
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libesp32/berry/src/be_solidifylib.c
View File

@ -147,7 +147,7 @@ static void m_solidify_map(bvm *vm, bbool str_literal, bmap * map, const char *c
#if BE_INTGER_TYPE == 2 #if BE_INTGER_TYPE == 2
logfmt(" { be_const_key_int(%lli, %i), ", node->key.v.i, key_next); logfmt(" { be_const_key_int(%lli, %i), ", node->key.v.i, key_next);
#else #else
logfmt(" { be_const_key_int(%i, %i), ", node->key.v.i, key_next); logfmt(" { be_const_key_int(%li, %i), ", node->key.v.i, key_next);
#endif #endif
m_solidify_bvalue(vm, str_literal, &node->value, class_name, NULL, fout); m_solidify_bvalue(vm, str_literal, &node->value, class_name, NULL, fout);
} else { } else {
@ -190,14 +190,14 @@ static void m_solidify_bvalue(bvm *vm, bbool str_literal, bvalue * value, const
#if BE_INTGER_TYPE == 2 #if BE_INTGER_TYPE == 2
logfmt("be_const_int(%lli)", var_toint(value)); logfmt("be_const_int(%lli)", var_toint(value));
#else #else
logfmt("be_const_int(%i)", var_toint(value)); logfmt("be_const_int(%li)", var_toint(value));
#endif #endif
break; break;
case BE_INDEX: case BE_INDEX:
#if BE_INTGER_TYPE == 2 #if BE_INTGER_TYPE == 2
logfmt("be_const_var(%lli)", var_toint(value)); logfmt("be_const_var(%lli)", var_toint(value));
#else #else
logfmt("be_const_var(%i)", var_toint(value)); logfmt("be_const_var(%li)", var_toint(value));
#endif #endif
break; break;
case BE_REAL: case BE_REAL:

6
lib/libesp32/berry_mapping/src/be_class_wrapper.c
View File

@ -169,7 +169,7 @@ int be_find_global_or_module_member(bvm *vm, const char * name) {
// if object instance, get `_p` member and convert it recursively // if object instance, get `_p` member and convert it recursively
intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *buf_len) { intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *buf_len) {
// berry_log_C("be_convert_single_elt(idx=%i, argtype='%s', type=%s)", idx, arg_type ? arg_type : "", be_typename(vm, idx)); // berry_log_C("be_convert_single_elt(idx=%i, argtype='%s', type=%s)", idx, arg_type ? arg_type : "", be_typename(vm, idx));
int ret = 0; intptr_t ret = 0;
char provided_type = 0; char provided_type = 0;
idx = be_absindex(vm, idx); // make sure we have an absolute index idx = be_absindex(vm, idx); // make sure we have an absolute index
@ -237,7 +237,7 @@ intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *buf
// check if the instance is a subclass of `bytes()`` // check if the instance is a subclass of `bytes()``
if (be_isbytes(vm, idx)) { if (be_isbytes(vm, idx)) {
size_t len; size_t len;
intptr_t ret = (intptr_t) be_tobytes(vm, idx, &len); ret = (intptr_t) be_tobytes(vm, idx, &len);
if (buf_len) { *buf_len = (int) len; } if (buf_len) { *buf_len = (int) len; }
return ret; return ret;
} else { } else {
@ -246,7 +246,7 @@ intptr_t be_convert_single_elt(bvm *vm, int idx, const char * arg_type, int *buf
be_pop(vm, 1); // remove `nil` be_pop(vm, 1); // remove `nil`
be_getmember(vm, idx, ".p"); be_getmember(vm, idx, ".p");
} // else `nil` is on top of stack } // else `nil` is on top of stack
int32_t ret = be_convert_single_elt(vm, -1, NULL, NULL); // recurse ret = be_convert_single_elt(vm, -1, NULL, NULL); // recurse
be_pop(vm, 1); be_pop(vm, 1);
if (arg_type_len > 1) { if (arg_type_len > 1) {