py/obj: Convert make_new into a mp_obj_type_t slot.

Instead of being an explicit field, it's now a slot like all the other
methods.

This is a marginal code size improvement because most types have a make_new
(100/138 on PYBV11), however it improves consistency in how types are
declared, removing the special case for make_new.

Signed-off-by: Jim Mussared <[email protected]>

Author: jimmo

drivers/ninaw10/nina_wifi_bsp.c

@@ -73,7 +73,7 @@ int nina_bsp_init(void) {
         MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIFI_SPI_BAUDRATE),
     };
 
-    MP_STATE_PORT(mp_wifi_spi) = machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 0, args);
+    MP_STATE_PORT(mp_wifi_spi) = MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 0, args);
     return 0;
 }
 

examples/natmod/framebuf/framebuf.c

@@ -20,8 +20,8 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     mp_type_framebuf.base.type = (void*)&mp_type_type;
     mp_type_framebuf.name = MP_QSTR_FrameBuffer;
-    mp_type_framebuf.make_new = framebuf_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 0);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, make_new, framebuf_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 1);
     framebuf_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
     framebuf_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
     framebuf_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
@@ -33,7 +33,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
     framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
     framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 1);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 2);
 
     mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
     mp_store_global(MP_QSTR_FrameBuffer1, MP_OBJ_FROM_PTR(&legacy_framebuffer1_obj));

examples/natmod/uzlib/uzlib.c

@@ -20,12 +20,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     decompio_type.base.type = mp_fun_table.type_type;
     decompio_type.name = MP_QSTR_DecompIO;
-    decompio_type.make_new = &decompio_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&decompio_type, protocol, &decompio_stream_p, 0);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, make_new, &decompio_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, protocol, &decompio_stream_p, 1);
     decompio_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
     decompio_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
     decompio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 1);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 2);
 
     mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uzlib));
     mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));

extmod/machine_i2c.c

@@ -734,7 +734,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_i2c_type,
     MP_QSTR_SoftI2C,
     MP_TYPE_FLAG_NONE,
-    mp_machine_soft_i2c_make_new,
+    make_new, mp_machine_soft_i2c_make_new,
     print, mp_machine_soft_i2c_print,
     protocol, &mp_machine_soft_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict

extmod/machine_i2c.h

@@ -38,7 +38,7 @@
                 --n_args; \
                 ++all_args; \
             } \
-            return mp_machine_soft_i2c_type.make_new(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
+            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_i2c_type, make_new)(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
         } \
     } while (0)
 

extmod/machine_mem.c

@@ -105,7 +105,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_mem_type,
     MP_QSTR_mem,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, machine_mem_print,
     subscr, machine_mem_subscr
     );

extmod/machine_pinbase.c

@@ -81,7 +81,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pinbase_type,
     MP_QSTR_PinBase,
     MP_TYPE_FLAG_NONE,
-    pinbase_make_new,
+    make_new, pinbase_make_new,
     protocol, &pinbase_pin_p
     );
 

extmod/machine_pwm.c

@@ -136,7 +136,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pwm_type,
     MP_QSTR_PWM,
     MP_TYPE_FLAG_NONE,
-    mp_machine_pwm_make_new,
+    make_new, mp_machine_pwm_make_new,
     print, mp_machine_pwm_print,
     locals_dict, &machine_pwm_locals_dict
     );

extmod/machine_signal.c

@@ -176,7 +176,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_signal_type,
     MP_QSTR_Signal,
     MP_TYPE_FLAG_NONE,
-    signal_make_new,
+    make_new, signal_make_new,
     call, signal_call,
     protocol, &signal_pin_p,
     locals_dict, &signal_locals_dict

extmod/machine_spi.c

@@ -255,7 +255,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_spi_type,
     MP_QSTR_SoftSPI,
     MP_TYPE_FLAG_NONE,
-    mp_machine_soft_spi_make_new,
+    make_new, mp_machine_soft_spi_make_new,
     print, mp_machine_soft_spi_print,
     protocol, &mp_machine_soft_spi_p,
     locals_dict, &mp_machine_spi_locals_dict