diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-12-08 12:28:11 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-12-10 22:19:48 +0000 |
| commit | bdbe8c9ae21559f6dc0b8e1ad84b7bbec2a04726 (patch) | |
| tree | 3c603ca42bd10e7d5bbd037d85d6b57735d39393 /py/vm.c | |
| parent | e242b1785f9e25b36f5d225652c679cd7cec6ec0 (diff) | |
| download | micropython-bdbe8c9ae21559f6dc0b8e1ad84b7bbec2a04726.tar.gz micropython-bdbe8c9ae21559f6dc0b8e1ad84b7bbec2a04726.zip | |
py: Make UNARY_OP_NOT a first-class op, to agree with Py not semantics.
Fixes #1684 and makes "not" match Python semantics. The code is also
simplified (the separate MP_BC_NOT opcode is removed) and the patch saves
68 bytes for bare-arm/ and 52 bytes for minimal/.
Previously "not x" was implemented as !mp_unary_op(x, MP_UNARY_OP_BOOL),
so any given object only needs to implement MP_UNARY_OP_BOOL (and the VM
had a special opcode to do the ! bit).
With this patch "not x" is implemented as mp_unary_op(x, MP_UNARY_OP_NOT),
but this operation is caught at the start of mp_unary_op and dispatched as
!mp_obj_is_true(x). mp_obj_is_true has special logic to test for
truthness, and is the correct way to handle the not operation.
Diffstat (limited to 'py/vm.c')
| -rw-r--r-- | py/vm.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -760,14 +760,6 @@ unwind_jump:; //sp -= 3; // pop 3 exception values DISPATCH(); - ENTRY(MP_BC_NOT): - if (TOP() == mp_const_true) { - SET_TOP(mp_const_false); - } else { - SET_TOP(mp_const_true); - } - DISPATCH(); - ENTRY(MP_BC_BUILD_TUPLE): { MARK_EXC_IP_SELECTIVE(); DECODE_UINT; @@ -1230,7 +1222,7 @@ yield: } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) { fastn[MP_BC_STORE_FAST_MULTI - (mp_int_t)ip[-1]] = POP(); DISPATCH(); - } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 6) { + } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + 7) { SET_TOP(mp_unary_op(ip[-1] - MP_BC_UNARY_OP_MULTI, TOP())); DISPATCH(); } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + 36) { |