From a62a1ae2bd16a4d8e4029b26bd23761da1b12d5f Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 21 Jul 2019 16:30:09 -0400
Subject: WIP: refactor _pixelbuf to use strings instead of classes

---
 shared-module/_pixelbuf/PixelBuf.c | 6 +++---
 shared-module/_pixelbuf/PixelBuf.h | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'shared-module')

diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index d32697239..6b222eec8 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -31,7 +31,7 @@
 #include "PixelBuf.h"
 #include <string.h>
 
-void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj_t *byteorder) {
+void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder) {
     buf[byteorder->byteorder.r] = value >> 16 & 0xff;
     buf[byteorder->byteorder.g] = (value >> 8) & 0xff;
     buf[byteorder->byteorder.b] = value & 0xff;
@@ -43,7 +43,7 @@ void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj
     }
 }
 
-void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_obj_t *byteorder, bool dotstar) {
+void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar) {
     if (MP_OBJ_IS_INT(item)) {
         uint8_t *target = rawbuf ? rawbuf : buf;
         pixelbuf_set_pixel_int(target, mp_obj_get_int_truncated(item), byteorder);
@@ -94,7 +94,7 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     }
 }
 
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_obj_t *byteorder, uint8_t step, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar) {
     mp_obj_t elems[len];
     for (uint i = 0; i < len; i++) {
         elems[i] = pixelbuf_get_pixel(buf + (i * step), byteorder, dotstar);
diff --git a/shared-module/_pixelbuf/PixelBuf.h b/shared-module/_pixelbuf/PixelBuf.h
index 9e115fe0c..6b3272e19 100644
--- a/shared-module/_pixelbuf/PixelBuf.h
+++ b/shared-module/_pixelbuf/PixelBuf.h
@@ -42,9 +42,9 @@
 #define DOTSTAR_GET_BRIGHTNESS(value) ((value & 0b00011111) / 31.0)
 #define DOTSTAR_LED_START_FULL_BRIGHT 0xFF
 
-void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_obj_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_obj_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_obj_t *byteorder, uint8_t step, bool dotstar);
-void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_obj_t *byteorder);
+void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar);
+void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder);
 
 #endif
-- 
cgit v1.2.3


From 31e4591691891abd92d8e3851cd13fb6dbc9bf64 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 21 Jul 2019 16:37:06 -0400
Subject: WIP: refactor _pixelbuf to use strings instead of classes

---
 shared-bindings/_pixelbuf/PixelBuf.c |   2 +-
 shared-bindings/_pixelbuf/__init__.c | 122 +----------------------------------
 shared-module/_pixelbuf/PixelBuf.c   |   2 +-
 3 files changed, 3 insertions(+), 123 deletions(-)

(limited to 'shared-module')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 2ea40d1de..01ba702c3 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -133,7 +133,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     if (args[ARG_byteorder].u_obj == NULL)
         byteorder_str = "BGR";
     else 
-        byteorder_str = mp_obj_str_get_data(byteorder_str, bo_len);
+        byteorder_str = mp_obj_str_get_data(args[ARG_byteorder].u_obj, &bo_len);
 
     parse_byteorder_string(byteorder_str, byteorder_details);
 
diff --git a/shared-bindings/_pixelbuf/__init__.c b/shared-bindings/_pixelbuf/__init__.c
index 229c04603..02d5f49b3 100644
--- a/shared-bindings/_pixelbuf/__init__.c
+++ b/shared-bindings/_pixelbuf/__init__.c
@@ -82,126 +82,6 @@ const int32_t colorwheel(float pos) {
     }
 }
 
-
-/// RGB
-//| .. data:: RGB
-//|
-//|    * **order** Red, Green, Blue
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(RGB, 3, 0, 1, 2, 3, false, false)
-//| .. data:: RBG
-//|
-//|    * **order** Red, Blue, Green
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(RBG, 3, 0, 2, 1, 3, false, false)
-//| .. data:: GRB
-//|
-//|    * **order** Green, Red, Blue
-//|    * **bpp** 3
-//|
-//|    Commonly used by NeoPixel.
-PIXELBUF_BYTEORDER(GRB, 3, 1, 0, 2, 3, false, false)
-//| .. data:: GBR
-//|
-//|    * **order** Green, Blue, Red
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(GBR, 3, 1, 2, 0, 3, false, false)
-//| .. data:: BRG
-//|
-//|    * **order** Blue, Red, Green
-//|    * **bpp** 3
-PIXELBUF_BYTEORDER(BRG, 3, 2, 0, 1, 3, false, false)
-//| .. data:: BGR
-//|
-//|    * **order** Blue, Green, Red
-//|    * **bpp** 3
-//|
-//|    Commonly used by Dotstar.
-PIXELBUF_BYTEORDER(BGR, 3, 2, 1, 0, 3, false, false)
-
-// RGBW
-//| .. data:: RGBW
-//|
-//|    * **order** Red, Green, Blue, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(RGBW, 4, 0, 1, 2, 3, true, false)
-//| .. data:: RBGW
-//|
-//|    * **order** Red, Blue, Green, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(RBGW, 4, 0, 2, 1, 3, true, false)
-//| .. data:: GRBW
-//|
-//|    * **order** Green, Red, Blue, White
-//|    * **bpp** 4
-//|    * **has_white** True
-//|
-//|    Commonly used by RGBW NeoPixels.
-PIXELBUF_BYTEORDER(GRBW, 4, 1, 0, 2, 3, true, false)
-//| .. data:: GBRW
-//|
-//|    * **order** Green, Blue, Red, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(GBRW, 4, 1, 2, 0, 3, true, false)
-//| .. data:: BRGW
-//|
-//|    * **order** Blue, Red, Green, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(BRGW, 4, 2, 0, 1, 3, true, false)
-//| .. data:: BGRW
-//|
-//|    * **order** Blue, Green, Red, White
-//|    * **bpp** 4
-//|    * **has_white** True
-PIXELBUF_BYTEORDER(BGRW, 4, 2, 1, 0, 3, true, false)
-
-// Luminosity + RGB (eg for Dotstar)
-// Luminosity chosen because the luminosity of a Dotstar at full bright
-// burns the eyes like looking at the Sun.
-// https://www.thesaurus.com/browse/luminosity?s=t
-//| .. data:: LRGB
-//|
-//|    * **order** *Luminosity*, Red, Green, Blue
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LRGB, 4, 1, 2, 3, 0, false, true)
-//| .. data:: LRBG
-//|
-//|    * **order** *Luminosity*, Red, Blue, Green
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LRBG, 4, 1, 3, 2, 0, false, true)
-//| .. data:: LGRB
-//|
-//|    * **order** *Luminosity*, Green, Red, Blue
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LGRB, 4, 2, 1, 3, 0, false, true)
-//| .. data:: LGBR
-//|
-//|    * **order** *Luminosity*, Green, Blue, Red
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LGBR, 4, 2, 3, 1, 0, false, true)
-//| .. data:: LBRG
-//|
-//|    * **order** *Luminosity*, Blue, Red, Green
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-PIXELBUF_BYTEORDER(LBRG, 4, 3, 1, 2, 0, false, true)
-//| .. data:: LBGR
-//|
-//|    * **order** *Luminosity*, Blue, Green, Red
-//|    * **bpp** 4
-//|    * **has_luminosity** True
-//|
-//|    Actual format commonly used by DotStar (5 bit luninance value)
-PIXELBUF_BYTEORDER(LBGR, 4, 3, 2, 1, 0, false, true)
-
 STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__pixelbuf) },
     { MP_ROM_QSTR(MP_QSTR_PixelBuf), MP_ROM_PTR(&pixelbuf_pixelbuf_type) },
@@ -223,7 +103,7 @@ STATIC const mp_rom_map_elem_t pixelbuf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_GBRD),  MP_ROM_QSTR(MP_QSTR_GBRD) },
     { MP_ROM_QSTR(MP_QSTR_BRGD),  MP_ROM_QSTR(MP_QSTR_BRGD) },
     { MP_ROM_QSTR(MP_QSTR_BGRD),  MP_ROM_QSTR(MP_QSTR_BGRD) },
-    { MP_ROM_QSTR(MP_QSTR_wheel), MP_ROM_QSTR(&pixelbuf_wheel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wheel), MP_ROM_PTR(&pixelbuf_wheel_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pixelbuf_module_globals, pixelbuf_module_globals_table);
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index 6b222eec8..b7cdef483 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -102,7 +102,7 @@ mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_de
     return mp_obj_new_tuple(len, elems);
 }
 
-mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_obj_t *byteorder, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar) {
     mp_obj_t elems[byteorder->bpp];
    
     elems[0] = mp_obj_new_int(buf[byteorder->byteorder.r]);
-- 
cgit v1.2.3


From 3cf9a475b99090d72b9992816808cbde309dcc40 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 4 Aug 2019 11:02:33 -0400
Subject: fix 'white' byte for dotstars

---
 shared-bindings/_pixelbuf/PixelBuf.c | 4 ++--
 shared-module/_pixelbuf/PixelBuf.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'shared-module')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 90210d4f3..969d16709 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -119,8 +119,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
     byteorder_details.byteorder.r = r - byteorder;
     byteorder_details.byteorder.g = g - byteorder;
     byteorder_details.byteorder.b = b - byteorder;
-    if (w) 
-        byteorder_details.byteorder.w = w - byteorder;
+    byteorder_details.byteorder.w = w ? w - byteorder : 0;
     // The dotstar brightness byte is always first (as it goes with the pixel start bits)
     // if 'D' is found at the end, adjust byte position
     // if 'D' is elsewhere, error out
@@ -130,6 +129,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_make_new(const mp_obj_type_t *type, size_t n_a
             byteorder_details.byteorder.b += 1;
             byteorder_details.byteorder.g += 1;
             byteorder_details.byteorder.r += 1;
+            byteorder_details.byteorder.w = 0;
         } else if (dotstar_pos != 0) {
             mp_raise_ValueError(translate("Invalid byteorder string"));
         }
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index b7cdef483..e26f05ac3 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -47,11 +47,11 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     if (MP_OBJ_IS_INT(item)) {
         uint8_t *target = rawbuf ? rawbuf : buf;
         pixelbuf_set_pixel_int(target, mp_obj_get_int_truncated(item), byteorder);
-         if (dotstar) {
+        if (dotstar) {
             buf[0] = DOTSTAR_LED_START_FULL_BRIGHT;
             if (rawbuf) 
                 rawbuf[0] = DOTSTAR_LED_START_FULL_BRIGHT;
-         }
+        }
         if (rawbuf) {
             buf[byteorder->byteorder.r] = rawbuf[byteorder->byteorder.r] * brightness;
             buf[byteorder->byteorder.g] = rawbuf[byteorder->byteorder.g] * brightness;
-- 
cgit v1.2.3


From 2970680e6af663200b35227bfbca5240542a4c47 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Sun, 20 Oct 2019 19:54:25 -0400
Subject: fix show and fix step > 1

---
 py/obj.c                             |  9 +++++++--
 py/objtype.c                         |  3 ++-
 shared-bindings/_pixelbuf/PixelBuf.c | 31 +++++++++++++++++++------------
 shared-bindings/_pixelbuf/PixelBuf.h |  2 +-
 shared-module/_pixelbuf/PixelBuf.c   |  7 +++++--
 shared-module/_pixelbuf/PixelBuf.h   |  2 +-
 6 files changed, 35 insertions(+), 19 deletions(-)

(limited to 'shared-module')

diff --git a/py/obj.c b/py/obj.c
index bd2aaf9d2..f91b00a64 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -489,14 +489,19 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
 
 mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(base);
+    mp_obj_t instance = base;
+    // If we got an MP_OBJ_SENTINEL as the type, then we got called by instance_subscr
+    if (type == MP_OBJ_SENTINEL) {
+        instance = ((mp_obj_t *)base)[1];
+        type = mp_obj_get_type(((mp_obj_t *)base)[2]);
+    }
     if (type->subscr != NULL) {
-        mp_obj_t ret = type->subscr(base, index, value);
+        mp_obj_t ret = type->subscr(instance, index, value);
         // May have called port specific C code. Make sure it didn't mess up the heap.
         assert_heap_ok();
         if (ret != MP_OBJ_NULL) {
             return ret;
         }
-        // TODO: call base classes here?
     }
     if (value == MP_OBJ_NULL) {
         if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
diff --git a/py/objtype.c b/py/objtype.c
index 5133d849f..7d41b8656 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -850,7 +850,8 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
         meth_args = 3;
     }
     if (member[0] == MP_OBJ_SENTINEL) {
-        return mp_obj_subscr(self->subobj[0], index, value);
+        mp_obj_t args[3] = {MP_OBJ_SENTINEL, self_in, self->subobj[0]};
+        return mp_obj_subscr(args, index, value);
     } else if (member[0] != MP_OBJ_NULL) {
         mp_obj_t args[3] = {self_in, index, value};
         // TODO probably need to call mp_convert_member_lookup, and use mp_call_method_n_kw
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index 3a2c88ef6..aeed6f504 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -230,7 +230,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_obj_set_brightness(mp_obj_t self_in, mp_obj_t
     if (self->two_buffers)
         pixelbuf_recalculate_brightness(self);
     if (self->auto_write)
-        call_show(self_in);
+        call_show(self_in, 'b');
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_set_brightness_obj, pixelbuf_pixelbuf_obj_set_brightness);
@@ -253,7 +253,7 @@ void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self) {
     }
 }
 
-mp_obj_t call_show(mp_obj_t self_in) {
+mp_obj_t call_show(mp_obj_t self_in, char origin) {
     mp_obj_t dest[2];
     mp_load_method(self_in, MP_QSTR_show, dest);
     return mp_call_method_n_kw(0, 0, dest);
@@ -356,29 +356,35 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
     }
 
     pixelbuf_pixelbuf_obj_t *self = native_pixelbuf(self_in);
+
     if (0) {
 #if MICROPY_PY_BUILTINS_SLICE
     } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
         mp_bound_slice_t slice;
 
-        if (!mp_seq_get_fast_slice_indexes(self->bytes, index_in, &slice))
-            // TODO support stepping!!!
-            mp_raise_NotImplementedError(translate("Only slices with step=1 (aka None) are supported"));
+        mp_seq_get_fast_slice_indexes(self->bytes, index_in, &slice);
+
         if ((slice.stop * self->pixel_step) > self->bytes)
             mp_raise_IndexError(translate("Range out of bounds"));
+        if (slice.step < 0)
+            mp_raise_IndexError(translate("Negative step not supported"));
 
         if (value == MP_OBJ_SENTINEL) { // Get
             size_t len = slice.stop - slice.start;
             uint8_t *readbuf = self->two_buffers ? self->rawbuf : self->buf;
-            return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, self->byteorder.is_dotstar);
+            return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, slice.step, self->byteorder.is_dotstar);
         } else { // Set
             #if MICROPY_PY_ARRAY_SLICE_ASSIGN
 
             if (!(MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple)))
                 mp_raise_ValueError(translate("tuple/list required on RHS"));
 
-            size_t dst_len = slice.stop - slice.start;
-
+            size_t dst_len = (slice.stop - slice.start);
+            dst_len = (slice.stop - slice.start) / slice.step;
+            if (slice.step > 1) {
+                if ((slice.stop - slice.start) % slice.step)
+                    dst_len ++;
+            }
             mp_obj_t *src_objs;
             size_t num_items;
             if (MP_OBJ_IS_TYPE(value, &mp_type_list)) {
@@ -394,16 +400,17 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
                 mp_raise_ValueError_varg(translate("Unmatched number of items on RHS (expected %d, got %d)."),
                                                    dst_len, num_items);
 
-            for (size_t i = slice.start; i < slice.stop; i++) {
+            size_t target_i = slice.start;
+            for (size_t i = slice.start; target_i < slice.stop; i++, target_i += slice.step) {
                 mp_obj_t *item = src_objs[i-slice.start];
                 if (MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple) || MP_OBJ_IS_INT(value)) {
-                    pixelbuf_set_pixel(self->buf + (i * self->pixel_step),
+                    pixelbuf_set_pixel(self->buf + (target_i * self->pixel_step),
                         self->two_buffers ? self->rawbuf + (i * self->pixel_step) : NULL,
                         self->brightness, item, &self->byteorder, self->byteorder.is_dotstar);
                 }
             }
             if (self->auto_write)
-                call_show(self_in);
+                call_show(self_in, 's');
             return mp_const_none;
             #else
             return MP_OBJ_NULL; // op not supported
@@ -423,7 +430,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             pixelbuf_set_pixel(self->buf + offset, self->two_buffers ? self->rawbuf + offset : NULL,
                 self->brightness, value, &self->byteorder, self->byteorder.is_dotstar);
             if (self->auto_write)
-                call_show(self_in);
+                call_show(self_in, 'i');
             return mp_const_none;
         }
     }
diff --git a/shared-bindings/_pixelbuf/PixelBuf.h b/shared-bindings/_pixelbuf/PixelBuf.h
index aa09e9261..18caa9219 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.h
+++ b/shared-bindings/_pixelbuf/PixelBuf.h
@@ -48,6 +48,6 @@ typedef struct {
 } pixelbuf_pixelbuf_obj_t;
 
 void pixelbuf_recalculate_brightness(pixelbuf_pixelbuf_obj_t *self);
-mp_obj_t call_show(mp_obj_t self_in);
+mp_obj_t call_show(mp_obj_t self_in, char origin);
 
 #endif  // CP_SHARED_BINDINGS_PIXELBUF_PIXELBUF_H
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index e26f05ac3..a0071903a 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -94,10 +94,13 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
     }
 }
 
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar) {
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar) {
     mp_obj_t elems[len];
+    if (slice_step > 1) {
+        len = len / slice_step;
+    }
     for (uint i = 0; i < len; i++) {
-        elems[i] = pixelbuf_get_pixel(buf + (i * step), byteorder, dotstar);
+        elems[i] = pixelbuf_get_pixel(buf + ((i * slice_step) * step), byteorder, dotstar);
     }
     return mp_obj_new_tuple(len, elems);
 }
diff --git a/shared-module/_pixelbuf/PixelBuf.h b/shared-module/_pixelbuf/PixelBuf.h
index 6b3272e19..173ce61a8 100644
--- a/shared-module/_pixelbuf/PixelBuf.h
+++ b/shared-module/_pixelbuf/PixelBuf.h
@@ -44,7 +44,7 @@
 
 void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_t *item, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
 mp_obj_t *pixelbuf_get_pixel(uint8_t *buf, pixelbuf_byteorder_details_t *byteorder, bool dotstar);
-mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, bool dotstar);
+mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar);
 void pixelbuf_set_pixel_int(uint8_t *buf, mp_int_t value, pixelbuf_byteorder_details_t *byteorder);
 
 #endif
-- 
cgit v1.2.3


From 56720eae0a9eb6fe8845cf20eb1298c3fb68a373 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Tue, 26 Nov 2019 18:39:08 -0500
Subject: remove unnecessary intermediate mp_obj_subscr wrapper

---
 extmod/modurandom.c               | 2 +-
 extmod/vfs.c                      | 2 +-
 ports/unix/modjni.c               | 2 +-
 py/obj.c                          | 6 +-----
 py/obj.h                          | 3 +--
 py/objreversed.c                  | 2 +-
 py/objtype.c                      | 2 +-
 py/vm.c                           | 4 ++--
 shared-bindings/random/__init__.c | 2 +-
 shared-module/os/__init__.c       | 2 +-
 10 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'shared-module')

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 1512a3fd4..101c80cf8 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -150,7 +150,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_randint_obj, mod_urandom_randint);
 STATIC mp_obj_t mod_urandom_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len > 0) {
-        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL);
+        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL, seq);
     } else {
         nlr_raise(mp_obj_new_exception(&mp_type_IndexError));
     }
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 7d6e6999b..7599739e0 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -373,7 +373,7 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
-        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL));
+        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL, next));
     }
     return dir_list;
 }
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 50dd10dd2..8f0eac5a9 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -311,7 +311,7 @@ STATIC mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 // TODO: subscr_load_adaptor & subscr_getiter convenience functions
 // should be moved to common location for reuse.
 STATIC mp_obj_t subscr_load_adaptor(mp_obj_t self_in, mp_obj_t index_in) {
-    return mp_obj_subscr(self_in, index_in, MP_OBJ_SENTINEL);
+    return mp_obj_subscr(self_in, index_in, MP_OBJ_SENTINEL, self_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(subscr_load_adaptor_obj, subscr_load_adaptor);
 
diff --git a/py/obj.c b/py/obj.c
index 54822c977..47aa1aebf 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -487,11 +487,7 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
     }
 }
 
-mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
-    return mp_obj_subscr_impl(base, index, value, base);
-}
-
-mp_obj_t mp_obj_subscr_impl(mp_obj_t base, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
     mp_obj_type_t *type = mp_obj_get_type(base);
 
     if (type->subscr != NULL) {
diff --git a/py/obj.h b/py/obj.h
index edeeb2a4b..ff97b34d8 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -707,8 +707,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
 mp_obj_t mp_obj_id(mp_obj_t o_in);
 mp_obj_t mp_obj_len(mp_obj_t o_in);
 mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); // may return MP_OBJ_NULL
-mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val);
-mp_obj_t mp_obj_subscr_impl(mp_obj_t base, mp_obj_t index, mp_obj_t val, mp_obj_t instance);
+mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val, mp_obj_t instance);
 mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in);
 
 // cell
diff --git a/py/objreversed.c b/py/objreversed.c
index 4937d0818..0b21e6938 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -66,7 +66,7 @@ STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
 
     // pre-decrement and index sequence
     self->cur_index -= 1;
-    return mp_obj_subscr(self->seq, MP_OBJ_NEW_SMALL_INT(self->cur_index), MP_OBJ_SENTINEL);
+    return mp_obj_subscr(self->seq, MP_OBJ_NEW_SMALL_INT(self->cur_index), MP_OBJ_SENTINEL, self->seq);
 }
 
 const mp_obj_type_t mp_type_reversed = {
diff --git a/py/objtype.c b/py/objtype.c
index 7d0760a10..9608a9242 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -852,7 +852,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
         meth_args = 3;
     }
     if (member[0] == MP_OBJ_SENTINEL) {
-        return mp_obj_subscr_impl(self->subobj[0], index, value, instance);
+        return mp_obj_subscr(self->subobj[0], index, value, instance);
     } else if (member[0] != MP_OBJ_NULL) {
         mp_obj_t args[3] = {self_in, index, value};
         // TODO probably need to call mp_convert_member_lookup, and use mp_call_method_n_kw
diff --git a/py/vm.c b/py/vm.c
index 353fc8810..2fe8d3237 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -386,7 +386,7 @@ dispatch_loop:
                 ENTRY(MP_BC_LOAD_SUBSCR): {
                     MARK_EXC_IP_SELECTIVE();
                     mp_obj_t index = POP();
-                    SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL));
+                    SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL, TOP()));
                     DISPATCH();
                 }
 
@@ -464,7 +464,7 @@ dispatch_loop:
 
                 ENTRY(MP_BC_STORE_SUBSCR):
                     MARK_EXC_IP_SELECTIVE();
-                    mp_obj_subscr(sp[-1], sp[0], sp[-2]);
+                    mp_obj_subscr(sp[-1], sp[0], sp[-2], sp[-1]);
                     sp -= 3;
                     DISPATCH();
 
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index 83698eac5..fdef91443 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -145,7 +145,7 @@ STATIC mp_obj_t random_choice(mp_obj_t seq) {
     if (len == 0) {
         mp_raise_IndexError(translate("empty sequence"));
     }
-    return mp_obj_subscr(seq, mp_obj_new_int(shared_modules_random_randrange(0, len, 1)), MP_OBJ_SENTINEL);
+    return mp_obj_subscr(seq, mp_obj_new_int(shared_modules_random_randrange(0, len, 1)), MP_OBJ_SENTINEL, seq);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice);
 
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index 8060eec4f..ad76251c8 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -127,7 +127,7 @@ mp_obj_t common_hal_os_listdir(const char* path) {
     mp_obj_t next;
     while ((next = mp_iternext(iter_obj)) != MP_OBJ_STOP_ITERATION) {
         // next[0] is the filename.
-        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL));
+        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL, dir_list));
         RUN_BACKGROUND_TASKS;
     }
     return dir_list;
-- 
cgit v1.2.3


From 222dd29a142a530b43fdf4d1ea01e276962b9886 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Tue, 10 Dec 2019 20:42:39 -0500
Subject: Fix slice step.

---
 shared-bindings/_pixelbuf/PixelBuf.c | 8 +++++---
 shared-module/_pixelbuf/PixelBuf.c   | 3 ---
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'shared-module')

diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index dabc23d35..feda2c573 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -391,6 +391,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
 
         if (value == MP_OBJ_SENTINEL) { // Get
             size_t len = slice.stop - slice.start;
+            if (slice.step > 1) {
+                len = (len / slice.step) + (len % slice.step ? 1 : 0);
+            }
             uint8_t *readbuf = self->two_buffers ? self->rawbuf : self->buf;
             return pixelbuf_get_pixel_array(readbuf + slice.start, len, &self->byteorder, self->pixel_step, slice.step, self->byteorder.is_dotstar);
         } else { // Set
@@ -399,10 +402,9 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             if (!(MP_OBJ_IS_TYPE(value, &mp_type_list) || MP_OBJ_IS_TYPE(value, &mp_type_tuple)))
                 mp_raise_ValueError(translate("tuple/list required on RHS"));
 
-            size_t dst_len = (slice.stop - slice.start) / slice.step;
+            size_t dst_len = (slice.stop - slice.start);
             if (slice.step > 1) {
-                if ((slice.stop - slice.start) % slice.step)
-                    dst_len ++;
+                dst_len = (dst_len / slice.step) + (dst_len % slice.step ? 1 : 0);
             }
             mp_obj_t *src_objs;
             size_t num_items;
diff --git a/shared-module/_pixelbuf/PixelBuf.c b/shared-module/_pixelbuf/PixelBuf.c
index a0071903a..020151bc3 100644
--- a/shared-module/_pixelbuf/PixelBuf.c
+++ b/shared-module/_pixelbuf/PixelBuf.c
@@ -96,9 +96,6 @@ void pixelbuf_set_pixel(uint8_t *buf, uint8_t *rawbuf, float brightness, mp_obj_
 
 mp_obj_t *pixelbuf_get_pixel_array(uint8_t *buf, uint len, pixelbuf_byteorder_details_t *byteorder, uint8_t step, mp_int_t slice_step, bool dotstar) {
     mp_obj_t elems[len];
-    if (slice_step > 1) {
-        len = len / slice_step;
-    }
     for (uint i = 0; i < len; i++) {
         elems[i] = pixelbuf_get_pixel(buf + ((i * slice_step) * step), byteorder, dotstar);
     }
-- 
cgit v1.2.3


From dc8dd6df20f4904917169f4ec1172c8f3827e822 Mon Sep 17 00:00:00 2001
From: Roy Hooper <rhooper@toybox.ca>
Date: Fri, 13 Dec 2019 14:29:15 -0500
Subject: Revert subscr signature change

---
 extmod/machine_mem.c                 | 2 +-
 extmod/modbtree.c                    | 2 +-
 extmod/moductypes.c                  | 2 +-
 extmod/modurandom.c                  | 2 +-
 extmod/vfs.c                         | 2 +-
 ports/unix/modjni.c                  | 4 ++--
 py/obj.c                             | 6 +++---
 py/obj.h                             | 4 ++--
 py/objarray.c                        | 3 +--
 py/objdict.c                         | 2 +-
 py/objlist.c                         | 2 +-
 py/objrange.c                        | 2 +-
 py/objreversed.c                     | 2 +-
 py/objstr.c                          | 2 +-
 py/objstrunicode.c                   | 2 +-
 py/objtuple.c                        | 2 +-
 py/objtuple.h                        | 2 +-
 py/objtype.c                         | 4 ++--
 py/opmethods.c                       | 6 +++---
 py/vm.c                              | 4 ++--
 shared-bindings/_pixelbuf/PixelBuf.c | 6 +++---
 shared-bindings/displayio/Bitmap.c   | 2 +-
 shared-bindings/displayio/Group.c    | 2 +-
 shared-bindings/displayio/Palette.c  | 2 +-
 shared-bindings/displayio/TileGrid.c | 2 +-
 shared-bindings/nvm/ByteArray.c      | 2 +-
 shared-bindings/pulseio/PulseIn.c    | 2 +-
 shared-bindings/random/__init__.c    | 2 +-
 shared-module/os/__init__.c          | 2 +-
 29 files changed, 39 insertions(+), 40 deletions(-)

(limited to 'shared-module')

diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 826c59d0f..75496c6b5 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -61,7 +61,7 @@ STATIC void machine_mem_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     // TODO support slice index to read/write multiple values at once
     machine_mem_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (value == MP_OBJ_NULL) {
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 939ab813e..ad845163d 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -247,7 +247,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     //mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_btree_t *self = mp_instance_cast_to_native_base(self_in, &btree_type);
     if (value == MP_OBJ_NULL) {
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 145b34887..bf5f1cef7 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -519,7 +519,7 @@ STATIC void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_obj_t value) {
     mp_obj_uctypes_struct_t *self = mp_instance_cast_to_native_base(base_in, &uctypes_struct_type);
 
     if (value == MP_OBJ_NULL) {
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 101c80cf8..1512a3fd4 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -150,7 +150,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_randint_obj, mod_urandom_randint);
 STATIC mp_obj_t mod_urandom_choice(mp_obj_t seq) {
     mp_int_t len = mp_obj_get_int(mp_obj_len(seq));
     if (len > 0) {
-        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL, seq);
+        return mp_obj_subscr(seq, mp_obj_new_int(yasmarang_randbelow(len)), MP_OBJ_SENTINEL);
     } else {
         nlr_raise(mp_obj_new_exception(&mp_type_IndexError));
     }
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 4d344095a..2bb4057e7 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -373,7 +373,7 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);
     mp_obj_t next;
     while ((next = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) {
-        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL, next));
+        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL));
     }
     return dir_list;
 }
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 8f0eac5a9..e18a26f3c 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -242,7 +242,7 @@ STATIC void get_jclass_name(jobject obj, char *buf) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t jobject_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_jobject_t *self = self_in;
     mp_uint_t idx = mp_obj_get_int(index);
     char class_name[64];
@@ -311,7 +311,7 @@ STATIC mp_obj_t jobject_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 // TODO: subscr_load_adaptor & subscr_getiter convenience functions
 // should be moved to common location for reuse.
 STATIC mp_obj_t subscr_load_adaptor(mp_obj_t self_in, mp_obj_t index_in) {
-    return mp_obj_subscr(self_in, index_in, MP_OBJ_SENTINEL, self_in);
+    return mp_obj_subscr(self_in, index_in, MP_OBJ_SENTINEL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(subscr_load_adaptor_obj, subscr_load_adaptor);
 
diff --git a/py/obj.c b/py/obj.c
index 47aa1aebf..09e71be4d 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -487,11 +487,11 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
     }
 }
 
-mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(base);
 
     if (type->subscr != NULL) {
-        mp_obj_t ret = type->subscr(base, index, value, instance);
+        mp_obj_t ret = type->subscr(base, index, value);
         // May have called port specific C code. Make sure it didn't mess up the heap.
         assert_heap_ok();
         if (ret != MP_OBJ_NULL) {
@@ -546,7 +546,7 @@ STATIC mp_obj_t generic_it_iternext(mp_obj_t self_in) {
     mp_obj_type_t *type = mp_obj_get_type(self->obj);
     mp_obj_t current_length = type->unary_op(MP_UNARY_OP_LEN, self->obj);
     if (self->cur < MP_OBJ_SMALL_INT_VALUE(current_length)) {
-        mp_obj_t o_out = type->subscr(self->obj, MP_OBJ_NEW_SMALL_INT(self->cur), MP_OBJ_SENTINEL, self->obj);
+        mp_obj_t o_out = type->subscr(self->obj, MP_OBJ_NEW_SMALL_INT(self->cur), MP_OBJ_SENTINEL);
         self->cur += 1;
         return o_out;
     } else {
diff --git a/py/obj.h b/py/obj.h
index ff97b34d8..cf4216d02 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -444,7 +444,7 @@ typedef mp_obj_t (*mp_call_fun_t)(mp_obj_t fun, size_t n_args, size_t n_kw, cons
 typedef mp_obj_t (*mp_unary_op_fun_t)(mp_unary_op_t op, mp_obj_t);
 typedef mp_obj_t (*mp_binary_op_fun_t)(mp_binary_op_t op, mp_obj_t, mp_obj_t);
 typedef void (*mp_attr_fun_t)(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
-typedef mp_obj_t (*mp_subscr_fun_t)(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance);
+typedef mp_obj_t (*mp_subscr_fun_t)(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
 typedef mp_obj_t (*mp_getiter_fun_t)(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
 
 // Buffer protocol
@@ -707,7 +707,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
 mp_obj_t mp_obj_id(mp_obj_t o_in);
 mp_obj_t mp_obj_len(mp_obj_t o_in);
 mp_obj_t mp_obj_len_maybe(mp_obj_t o_in); // may return MP_OBJ_NULL
-mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val, mp_obj_t instance);
+mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val);
 mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in);
 
 // cell
diff --git a/py/objarray.c b/py/objarray.c
index 6fffa8412..9114a63c5 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -396,8 +396,7 @@ STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_extend_obj, array_extend);
 #endif
 
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         // TODO implement
diff --git a/py/objdict.c b/py/objdict.c
index 2c07331e7..5bbe939b1 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -175,7 +175,7 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete
         mp_obj_dict_delete(self_in, index);
diff --git a/py/objlist.c b/py/objlist.c
index 0c0d60aa8..64381bc70 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -159,7 +159,7 @@ STATIC mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_list_t *self = mp_instance_cast_to_native_base(self_in, &mp_type_list);
     if (value == MP_OBJ_NULL) {
         // delete
diff --git a/py/objrange.c b/py/objrange.c
index 328416303..6f14bcc9f 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -159,7 +159,7 @@ STATIC mp_obj_t range_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 #endif
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_SENTINEL) {
         // load
         mp_obj_range_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/py/objreversed.c b/py/objreversed.c
index 0b21e6938..4937d0818 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -66,7 +66,7 @@ STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
 
     // pre-decrement and index sequence
     self->cur_index -= 1;
-    return mp_obj_subscr(self->seq, MP_OBJ_NEW_SMALL_INT(self->cur_index), MP_OBJ_SENTINEL, self->seq);
+    return mp_obj_subscr(self->seq, MP_OBJ_NEW_SMALL_INT(self->cur_index), MP_OBJ_SENTINEL);
 }
 
 const mp_obj_type_t mp_type_reversed = {
diff --git a/py/objstr.c b/py/objstr.c
index fd802fe85..567e73444 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -440,7 +440,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
 
 // This is used for both bytes and 8-bit strings. This is not used for unicode strings.
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
     if (value == MP_OBJ_SENTINEL) {
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index dc8c0743d..2540a1d7b 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -198,7 +198,7 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
     assert(type == &mp_type_str);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
diff --git a/py/objtuple.c b/py/objtuple.c
index b6640def5..7a4c09ab7 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -178,7 +178,7 @@ mp_obj_t mp_obj_tuple_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
 }
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_SENTINEL) {
         // load
         mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/py/objtuple.h b/py/objtuple.h
index 4df3aeded..7f20ab7b6 100644
--- a/py/objtuple.h
+++ b/py/objtuple.h
@@ -45,7 +45,7 @@ extern const mp_obj_type_t mp_type_tuple;
 void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind);
 mp_obj_t mp_obj_tuple_unary_op(mp_unary_op_t op, mp_obj_t self_in);
 mp_obj_t mp_obj_tuple_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs);
-mp_obj_t mp_obj_tuple_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value, mp_obj_t instance);
+mp_obj_t mp_obj_tuple_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value);
 mp_obj_t mp_obj_tuple_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf);
 
 extern const mp_obj_type_t mp_type_attrtuple;
diff --git a/py/objtype.c b/py/objtype.c
index c7dc2ae78..a5e733208 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -826,7 +826,7 @@ STATIC void mp_obj_instance_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t member[2] = {MP_OBJ_NULL};
     struct class_lookup_data lookup = {
@@ -855,7 +855,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
     if (member[0] == MP_OBJ_SENTINEL) { // native base subscr exists
         mp_obj_type_t *subobj_type = mp_obj_get_type(self->subobj[0]);
         // return mp_obj_subscr(self->subobj[0], index, value, instance);
-        mp_obj_t ret = subobj_type->subscr(self_in, index, value, instance);
+        mp_obj_t ret = subobj_type->subscr(self_in, index, value);
         // May have called port specific C code. Make sure it didn't mess up the heap.
         assert_heap_ok();
         return ret;
diff --git a/py/opmethods.c b/py/opmethods.c
index d906ddb6a..247fa5bbc 100644
--- a/py/opmethods.c
+++ b/py/opmethods.c
@@ -29,19 +29,19 @@
 
 STATIC mp_obj_t op_getitem(mp_obj_t self_in, mp_obj_t key_in) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, MP_OBJ_SENTINEL, self_in);
+    return type->subscr(self_in, key_in, MP_OBJ_SENTINEL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_op_getitem_obj, op_getitem);
 
 STATIC mp_obj_t op_setitem(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t value_in) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, value_in, self_in);
+    return type->subscr(self_in, key_in, value_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_3(mp_op_setitem_obj, op_setitem);
 
 STATIC mp_obj_t op_delitem(mp_obj_t self_in, mp_obj_t key_in) {
     mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, MP_OBJ_NULL, self_in);
+    return type->subscr(self_in, key_in, MP_OBJ_NULL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_op_delitem_obj, op_delitem);
 
diff --git a/py/vm.c b/py/vm.c
index 2fe8d3237..353fc8810 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -386,7 +386,7 @@ dispatch_loop:
                 ENTRY(MP_BC_LOAD_SUBSCR): {
                     MARK_EXC_IP_SELECTIVE();
                     mp_obj_t index = POP();
-                    SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL, TOP()));
+                    SET_TOP(mp_obj_subscr(TOP(), index, MP_OBJ_SENTINEL));
                     DISPATCH();
                 }
 
@@ -464,7 +464,7 @@ dispatch_loop:
 
                 ENTRY(MP_BC_STORE_SUBSCR):
                     MARK_EXC_IP_SELECTIVE();
-                    mp_obj_subscr(sp[-1], sp[0], sp[-2], sp[-1]);
+                    mp_obj_subscr(sp[-1], sp[0], sp[-2]);
                     sp -= 3;
                     DISPATCH();
 
diff --git a/shared-bindings/_pixelbuf/PixelBuf.c b/shared-bindings/_pixelbuf/PixelBuf.c
index feda2c573..a3579c92c 100644
--- a/shared-bindings/_pixelbuf/PixelBuf.c
+++ b/shared-bindings/_pixelbuf/PixelBuf.c
@@ -368,7 +368,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pixelbuf_pixelbuf_fill_obj, pixelbuf_pixelbuf_f
 //|
 //|     Sets the pixel value at the given index.
 //|
-STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         // slice deletion
@@ -431,7 +431,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
                 }
             }
             if (self->auto_write)
-                call_show(instance);
+                call_show(self_in);
             return mp_const_none;
             #else
             return MP_OBJ_NULL; // op not supported
@@ -451,7 +451,7 @@ STATIC mp_obj_t pixelbuf_pixelbuf_subscr(mp_obj_t self_in, mp_obj_t index_in, mp
             pixelbuf_set_pixel(self->buf + offset, self->two_buffers ? self->rawbuf + offset : NULL,
                 self->brightness, value, &self->byteorder, self->byteorder.is_dotstar);
             if (self->auto_write)
-                call_show(instance);
+                call_show(self_in);
             return mp_const_none;
         }
     }
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c
index 7c77d05ed..ca9484a40 100644
--- a/shared-bindings/displayio/Bitmap.c
+++ b/shared-bindings/displayio/Bitmap.c
@@ -134,7 +134,7 @@ const mp_obj_property_t displayio_bitmap_height_obj = {
 //|       bitmap[0,1] = 3
 //|
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj, mp_obj_t instance) {
+STATIC mp_obj_t bitmap_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     if (value_obj == mp_const_none) {
         // delete item
         mp_raise_AttributeError(translate("Cannot delete values"));
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index 40f2704c0..f5e3c2263 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -311,7 +311,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|       del group[0]
 //|
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t group_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     displayio_group_t *self = native_group(self_in);
 
     if (MP_OBJ_IS_TYPE(index_obj, &mp_type_slice)) {
diff --git a/shared-bindings/displayio/Palette.c b/shared-bindings/displayio/Palette.c
index 2fa65867a..903338abb 100644
--- a/shared-bindings/displayio/Palette.c
+++ b/shared-bindings/displayio/Palette.c
@@ -96,7 +96,7 @@ STATIC mp_obj_t group_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|       palette[3] = bytearray(b'\x00\x00\xFF')   # set using a bytearay of 3 or 4 bytes
 //|
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t palette_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         return MP_OBJ_NULL; // op not supported
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index 5acf8496f..288eb4b23 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -349,7 +349,7 @@ const mp_obj_property_t displayio_tilegrid_pixel_shader_obj = {
 //|
 //|       grid[0,0] = 10
 //|
-STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj, mp_obj_t instance) {
+STATIC mp_obj_t tilegrid_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value_obj) {
     displayio_tilegrid_t *self = native_tilegrid(self_in);
 
 
diff --git a/shared-bindings/nvm/ByteArray.c b/shared-bindings/nvm/ByteArray.c
index 5ac46b260..31bedeacc 100644
--- a/shared-bindings/nvm/ByteArray.c
+++ b/shared-bindings/nvm/ByteArray.c
@@ -70,7 +70,7 @@ STATIC const mp_rom_map_elem_t nvm_bytearray_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(nvm_bytearray_locals_dict, nvm_bytearray_locals_dict_table);
 
-STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t nvm_bytearray_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete item
         // slice deletion
diff --git a/shared-bindings/pulseio/PulseIn.c b/shared-bindings/pulseio/PulseIn.c
index 5947329a5..8b69109f0 100644
--- a/shared-bindings/pulseio/PulseIn.c
+++ b/shared-bindings/pulseio/PulseIn.c
@@ -272,7 +272,7 @@ STATIC mp_obj_t pulsein_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 //|       pulses = pulseio.PulseIn(pin)
 //|       print(pulses[0])
 //|
-STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value, mp_obj_t instance) {
+STATIC mp_obj_t pulsein_subscr(mp_obj_t self_in, mp_obj_t index_obj, mp_obj_t value) {
     if (value == mp_const_none) {
         // delete item
         mp_raise_AttributeError(translate("Cannot delete values"));
diff --git a/shared-bindings/random/__init__.c b/shared-bindings/random/__init__.c
index fdef91443..83698eac5 100644
--- a/shared-bindings/random/__init__.c
+++ b/shared-bindings/random/__init__.c
@@ -145,7 +145,7 @@ STATIC mp_obj_t random_choice(mp_obj_t seq) {
     if (len == 0) {
         mp_raise_IndexError(translate("empty sequence"));
     }
-    return mp_obj_subscr(seq, mp_obj_new_int(shared_modules_random_randrange(0, len, 1)), MP_OBJ_SENTINEL, seq);
+    return mp_obj_subscr(seq, mp_obj_new_int(shared_modules_random_randrange(0, len, 1)), MP_OBJ_SENTINEL);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(random_choice_obj, random_choice);
 
diff --git a/shared-module/os/__init__.c b/shared-module/os/__init__.c
index ad76251c8..8060eec4f 100644
--- a/shared-module/os/__init__.c
+++ b/shared-module/os/__init__.c
@@ -127,7 +127,7 @@ mp_obj_t common_hal_os_listdir(const char* path) {
     mp_obj_t next;
     while ((next = mp_iternext(iter_obj)) != MP_OBJ_STOP_ITERATION) {
         // next[0] is the filename.
-        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL, dir_list));
+        mp_obj_list_append(dir_list, mp_obj_subscr(next, MP_OBJ_NEW_SMALL_INT(0), MP_OBJ_SENTINEL));
         RUN_BACKGROUND_TASKS;
     }
     return dir_list;
-- 
cgit v1.2.3