'int' to 'short unsigned int' frozen content.c

[8888clockradio]

It appears I have too many qstr's for the port to keep up with

build-SHAREDLIB/frozen_content.c:6032358: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '151238' to '20166' [-Woverflow]
6032358 |     MP_QSTR_PL1,
        | 
build-SHAREDLIB/frozen_content.c:6032617: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '152969' to '21897' [-Woverflow]
6032617 |     MP_QSTR_busio_slash_adafruit_blinka_slash_microcontroller_slash_allwinner_slash_h5_slash___init___dot_py,
        | 
build-SHAREDLIB/frozen_content.c:6032776: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '152970' to '21898' [-Woverflow]
6032776 |     MP_QSTR_busio_slash_adafruit_blinka_slash_microcontroller_slash_allwinner_slash_a33_slash_pin_dot_py,
        | 
build-SHAREDLIB/frozen_content.c:6032779: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '151985' to '20913' [-Woverflow]
6032779 |     MP_QSTR_adafruit_blinka_dot_microcontroller_dot_generic_linux_dot_libgpiod_pin,
        | 
build-SHAREDLIB/frozen_content.c:6032780: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150468' to '19396' [-Woverflow]
6032780 |     MP_QSTR_PB0,
        | 
build-SHAREDLIB/frozen_content.c:6032781: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150727' to '19655' [-Woverflow]
6032781 |     MP_QSTR_UART2_TX,
        | 
build-SHAREDLIB/frozen_content.c:6032782: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150470' to '19398' [-Woverflow]
6032782 |     MP_QSTR_PB1,
        | 
build-SHAREDLIB/frozen_content.c:6032783: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150726' to '19654' [-Woverflow]
6032783 |     MP_QSTR_UART2_RX,
        | 
build-SHAREDLIB/frozen_content.c:6032784: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150473' to '19401' [-Woverflow]
6032784 |     MP_QSTR_PC0,
        | 
build-SHAREDLIB/frozen_content.c:6032785: warning: unsigned conversion from 'int' to 'short unsigned int' changes value from '150827' to '19755' [-Woverflow]

Should I change this:

    def freeze(self, compiled_module_index):
        print()
        print("/" * 80)
        print("// frozen module %s" % self.escaped_name)
        print("// - original source file: %s" % self.mpy_source_file)
        print("// - frozen file name: %s" % self.source_file.str)
        print("// - .mpy header: %s" % ":".join("%02x" % b for b in self.header))
        print()

        self.raw_code.freeze()
        print()

        self.freeze_constants()

        print()
        print("static const FLASHMEM mp_frozen_module_t frozen_module_%s = {" % self.escaped_name)
        print("    .constants = {")
        if len(self.qstr_table):
            print(
                "        .qstr_table = (qstr_short_t *)&const_qstr_table_data_%s,"
                % self.escaped_name
            )
        else:
            print("        .qstr_table = NULL,")
        if len(self.obj_table):
            print("        .obj_table = (mp_obj_t *)&const_obj_table_data_%s," % self.escaped_name)
        else:
            print("        .obj_table = NULL,")
        print("    },")
        print("    .rc = &raw_code_%s," % self.raw_code.escaped_name)
        print("};")

TO:

    def freeze(self, compiled_module_index):
        print()
        print("/" * 80)
        print("// frozen module %s" % self.escaped_name)
        print("// - original source file: %s" % self.mpy_source_file)
        print("// - frozen file name: %s" % self.source_file.str)
        print("// - .mpy header: %s" % ":".join("%02x" % b for b in self.header))
        print()

        self.raw_code.freeze()
        print()

        self.freeze_constants()

        print()
        print("static const FLASHMEM mp_frozen_module_t frozen_module_%s = {" % self.escaped_name)
        print("    .constants = {")
        if len(self.qstr_table):
            print(
#change here MP_QSTR_int
                "        .qstr_table = (MP_QSTR_int *)&const_qstr_table_data_%s,"
                % self.escaped_name
            )
        else:
            print("        .qstr_table = NULL,")
        if len(self.obj_table):
            print("        .obj_table = (mp_obj_t *)&const_obj_table_data_%s," % self.escaped_name)
        else:
            print("        .obj_table = NULL,")
        print("    },")
        print("    .rc = &raw_code_%s," % self.raw_code.escaped_name)
        print("};")

[rnik12]

Something is wrong, int to short uint will lose data.

[dpgeorge]

There are a lot of places in the code that assume the number of qstrs will not exceed a 16-bit number. The main place to change this is in py/qstr.h:

typedef uint16_t qstr_short_t;

You can try changing that to uint32_t and see if it works. Maybe other things will also need to change.