TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Fix check of small-int overflow when parsing ints.

Browse Source 
Also unifies use of SMALL_INT_FITS macro across parser and runtime.
This commit is contained in:
Damien George
2014-05-28 14:51:12 +01:00
parent 813ed3bda6
commit d1e355ea8e
11 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
py/parse.h
View File

@@ -37,13 +37,6 @@ struct _mp_lexer_t;
// - xx...x10010: a string of bytes; bits 5 and above are the qstr holding the value
// - xx...x10110: a token; bits 5 and above are mp_token_kind_t
// TODO: these can now be unified with MP_OBJ_FITS_SMALL_INT(x)
// makes sure the top 2 bits of x are all cleared (positive number) or all set (negavite number)
// these macros can probably go somewhere else because they are used more than just in the parser
#define MP_UINT_HIGH_2_BITS (~((~((machine_uint_t)0)) >> 2))
// parser's small ints are different from VM small int
#define MP_PARSE_FITS_SMALL_INT(x) (((((machine_uint_t)(x)) & MP_UINT_HIGH_2_BITS) == 0) || ((((machine_uint_t)(x)) & MP_UINT_HIGH_2_BITS) == MP_UINT_HIGH_2_BITS))
#define MP_PARSE_NODE_NULL (0)
#define MP_PARSE_NODE_SMALL_INT (0x1)
#define MP_PARSE_NODE_ID (0x02)