Commita75b02e

committed

py: Improve efficiency of MP_OBJ_IS_STR_OR_BYTES.

Saves ROM (16 on stmhal, 240 on 64-bit unix) and should be quicker sincethere is 1 less branch.

1 parentad4c014 commita75b02eCopy full SHA for a75b02e

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ typedef struct _mp_obj_base_t mp_obj_base_t;`
`74`	`74`	`#defineMP_OBJ_IS_TYPE(o,t) (MP_OBJ_IS_OBJ(o) && (((mp_obj_base_t*)(o))->type == (t))) // this does not work for checking int, str or fun; use below macros for that`
`75`	`75`	`#defineMP_OBJ_IS_INT(o) (MP_OBJ_IS_SMALL_INT(o) \|\| MP_OBJ_IS_TYPE(o, &mp_type_int))`
`76`	`76`	`#defineMP_OBJ_IS_STR(o) (MP_OBJ_IS_QSTR(o) \|\| MP_OBJ_IS_TYPE(o, &mp_type_str))`
`77`		`-#defineMP_OBJ_IS_STR_OR_BYTES(o) (MP_OBJ_IS_STR(o) \|\|MP_OBJ_IS_TYPE(o, &mp_type_bytes))`
	`77`	`+#defineMP_OBJ_IS_STR_OR_BYTES(o) (MP_OBJ_IS_QSTR(o) \|\|(MP_OBJ_IS_OBJ(o) && ((mp_obj_base_t*)(o))->type->binary_op == mp_obj_str_binary_op))`
`78`	`78`	`#defineMP_OBJ_IS_FUN(o) (MP_OBJ_IS_OBJ(o) && (((mp_obj_base_t*)(o))->type->binary_op == mp_obj_fun_binary_op))`
`79`	`79`
`80`	`80`	`#defineMP_OBJ_SMALL_INT_VALUE(o) (((mp_int_t)(o)) >> 1)`

Lines changed: 1 addition & 0 deletions

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,9 @@ STATIC const byte find_subbytes(const byte haystack, mp_uint_t hlen, const byt`
`247`	`247`	`returnNULL;`
`248`	`248`	`}`
`249`	`249`
	`250`	`+// Note: this function is used to check if an object is a str or bytes, which`
	`251`	`+// works because both those types use it as their binary_op method. Revisit`
	`252`	`+// MP_OBJ_IS_STR_OR_BYTES if this fact changes.`
`250`	`253`	`mp_obj_tmp_obj_str_binary_op(intop,mp_obj_tlhs_in,mp_obj_trhs_in) {`
`251`	`254`	`GET_STR_DATA_LEN(lhs_in,lhs_data,lhs_len);`
`252`	`255`	`mp_obj_type_t*lhs_type=mp_obj_get_type(lhs_in);`

Comments

(0)