Merge pull request pycom#115 from robert-hh/utime

husigeza · web-flow · commit df7839ef8c40 · 2018-01-23T18:33:56.000+01:00
modutime.c: Ensure proper smallint values on overflow
diff --git a/esp32/mods/modutime.c b/esp32/mods/modutime.c
@@ -170,12 +170,19 @@ STATIC mp_obj_t time_ticks_cpu(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_cpu_obj, time_ticks_cpu);
 
 STATIC mp_obj_t time_ticks_diff(mp_obj_t start_in, mp_obj_t end_in) {
-   uint32_t start = mp_obj_get_int(start_in);
-   uint32_t end = mp_obj_get_int(end_in);
-   return mp_obj_new_int_from_uint((end - start));
+    int32_t start = mp_obj_get_int_truncated(start_in);
+    int32_t end = mp_obj_get_int_truncated(end_in);
+    return mp_obj_new_int(end - start);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(time_ticks_diff_obj, time_ticks_diff);
 
+STATIC mp_obj_t time_ticks_add(mp_obj_t start_in, mp_obj_t delta_in) {
+    int32_t start = mp_obj_get_int_truncated(start_in);
+    int32_t delta = mp_obj_get_int_truncated(delta_in);
+    return mp_obj_new_int(start + delta);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(time_ticks_add_obj, time_ticks_add);
+
 /// \function time()
 /// Returns the number of seconds, as an integer, since 1/1/1970.
 STATIC mp_obj_t time_time(void) {
@@ -208,6 +215,7 @@ STATIC const mp_map_elem_t time_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_ms),            (mp_obj_t)&time_ticks_ms_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_us),            (mp_obj_t)&time_ticks_us_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_cpu),           (mp_obj_t)&time_ticks_cpu_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_add),           (mp_obj_t)&time_ticks_add_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_diff),          (mp_obj_t)&time_ticks_diff_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_time),                (mp_obj_t)&time_time_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_timezone),            (mp_obj_t)&time_timezone_obj },
