mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Berry fix bool side effect (#19790)

This commit is contained in:
s-hadinger 2023-10-18 20:02:47 +02:00 committed by GitHub
parent 26e9d7e49c
commit 385408dcfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libesp32/berry/src/be_code.c
View File

@ -472,7 +472,18 @@ static int exp2reg(bfuncinfo *finfo, bexpdesc *e, int dst)
int pcf = NO_JUMP; /* position of an eventual LOAD false */
int pct = NO_JUMP; /* position of an eventual LOAD true */
int jpt = appendjump(finfo, jumpboolop(e, 1), e);
reg = e->v.idx;
/* below is a simplified version of `codedestreg` for a single bexpdesc */
if (e->type == ETREG) {
/* if e is already ETREG from local calculation, we reuse the register */
reg = e->v.idx;
} else {
/* otherwise, we allocate a new register or use the target provided */
if (dst < 0) {
reg = be_code_allocregs(finfo, 1);
} else {
reg = dst;
}
}
be_code_conjump(finfo, &e->t, jpt);
pcf = code_bool(finfo, reg, 0, 1);
pct = code_bool(finfo, reg, 1, 0);

4
lib/libesp32/berry/tests/bool.be
View File

@ -47,3 +47,7 @@ assert(bool({nil:nil}) == false)# changed behavior - `nil` key is ignored so the
import introspect
assert(bool(introspect.toptr(0x1000)) == true)
assert(bool(introspect.toptr(0)) == false)
# reproduce bug https://github.com/berry-lang/berry/issues/372
def f() var a = false var b = true || a return a end
assert(f() == false)

21
lib/libesp32/berry_tasmota/src/solidify/solidified_mqtt.h
View File

@ -27,7 +27,7 @@ be_local_closure(MQTT_mqtt_data, /* name */
}),
&be_const_str_mqtt_data,
&be_const_str_solidified,
( &(const binstruction[32]) { /* code */
( &(const binstruction[31]) { /* code */
0x88140100, // 0000 GETMBR R5 R0 K0
0x4C180000, // 0001 LDNIL R6
0x1C140A06, // 0002 EQ R5 R5 R6
@ -37,13 +37,13 @@ be_local_closure(MQTT_mqtt_data, /* name */
0x60180010, // 0006 GETGBL R6 G16
0x881C0100, // 0007 GETMBR R7 R0 K0
0x7C180200, // 0008 CALL R6 1
0xA8020011, // 0009 EXBLK 0 #001C
0xA8020010, // 0009 EXBLK 0 #001B
0x5C1C0C00, // 000A MOVE R7 R6
0x7C1C0000, // 000B CALL R7 0
0x88200F01, // 000C GETMBR R8 R7 K1
0x4C240000, // 000D LDNIL R9
0x20201009, // 000E NE R8 R8 R9
0x7822000A, // 000F JMPF R8 #001B
0x78220009, // 000F JMPF R8 #001A
0x8C200F02, // 0010 GETMET R8 R7 K2
0x5C280200, // 0011 MOVE R10 R1
0x5C2C0400, // 0012 MOVE R11 R2
@ -52,14 +52,13 @@ be_local_closure(MQTT_mqtt_data, /* name */
0x7C200A00, // 0015 CALL R8 5
0x74160001, // 0016 JMPT R5 #0019
0x74220000, // 0017 JMPT R8 #0019
0x50200001, // 0018 LDBOOL R8 0 1
0x50200200, // 0019 LDBOOL R8 1 0
0x5C141000, // 001A MOVE R5 R8
0x7001FFED, // 001B JMP #000A
0x58180003, // 001C LDCONST R6 K3
0xAC180200, // 001D CATCH R6 1 0
0xB0080000, // 001E RAISE 2 R0 R0
0x80040A00, // 001F RET 1 R5
0x50140001, // 0018 LDBOOL R5 0 1
0x50140200, // 0019 LDBOOL R5 1 0
0x7001FFEE, // 001A JMP #000A
0x58180003, // 001B LDCONST R6 K3
0xAC180200, // 001C CATCH R6 1 0
0xB0080000, // 001D RAISE 2 R0 R0
0x80040A00, // 001E RET 1 R5
})
)
);