working on compilation errors

Author: dhalbert

extmod/extmod.mk

@@ -1,6 +1,8 @@
 # This makefile fragment adds the source code files for the core extmod modules
 # and provides rules to build 3rd-party components for extmod modules.
 
+# CIRCUITPY-CHANGE: many extmod modules removed
+# CIRCUITPY-CHANGE: modzlib.c still used
 SRC_EXTMOD_C += \
 	extmod/modasyncio.c \
 	extmod/modbinascii.c \
@@ -12,7 +14,6 @@ SRC_EXTMOD_C += \
 	extmod/modrandom.c \
 	extmod/modre.c \
 	extmod/modselect.c \
-	extmod/moductypes.c \
 	extmod/modzlib.c \
 	extmod/vfs.c \
 	extmod/vfs_blockdev.c \

extmod/modjson.c

@@ -442,7 +442,7 @@ static mp_obj_t mod_json_loads(mp_obj_t obj) {
     vstr_t vstr = {bufinfo.len, bufinfo.len, (char *)bufinfo.buf, true};
     mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
     // CIRCUITPY-CHANGE
-    return mod_json_load(MP_OBJ_FROM_PTR(&sio), false);
+    return _mod_json_load(MP_OBJ_FROM_PTR(&sio), false);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mod_json_loads_obj, mod_json_loads);
 

extmod/vfs_fat.c

@@ -526,7 +526,8 @@ static const mp_obj_property_t fat_vfs_label_obj = {
 #endif
 
 static const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
-    #if _FS_REENTRANT
+    // CIRCUITPY-CHANGE: correct name
+    #if FF_FS_REENTRANT
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&fat_vfs_del_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_mkfs), MP_ROM_PTR(&fat_vfs_mkfs_obj) },

extmod/vfs_fat_file.c

@@ -62,11 +62,6 @@ const byte fresult_to_errno_table[20] = {
     [FR_INVALID_PARAMETER] = MP_EINVAL,
 };
 
-typedef struct _pyb_file_obj_t {
-    mp_obj_base_t base;
-    FIL fp;
-} pyb_file_obj_t;
-
 static void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     // CIRCUITPY-CHANGE

lib/mbedtls

@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018-2022 Damien P. George
+ * Copyright (c) 2018-2019 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,17 +23,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
-#define MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
 // If you want to debug MBEDTLS uncomment the following and
-// pass "3" to mbedtls_debug_set_threshold in socket_new.
+// Pass 3 to mbedtls_debug_set_threshold in socket_new
 // #define MBEDTLS_DEBUG_C
 
-// Set mbedtls configuration.
-#define MBEDTLS_HAVE_TIME
-#define MBEDTLS_HAVE_TIME_DATE
+// Set mbedtls configuration
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
 #define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
 #define MBEDTLS_AES_ROM_TABLES
 #define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_ECP_DP_SECP192R1_ENABLED
@@ -44,26 +45,39 @@
 #define MBEDTLS_ECP_DP_SECP192K1_ENABLED
 #define MBEDTLS_ECP_DP_SECP224K1_ENABLED
 #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-#define MBEDTLS_CAN_ECDH
-#define MBEDTLS_PK_CAN_ECDSA_SIGN
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
 #define MBEDTLS_PKCS1_V15
 #define MBEDTLS_SHA256_SMALLER
 #define MBEDTLS_SSL_PROTO_TLS1
 #define MBEDTLS_SSL_PROTO_TLS1_1
 #define MBEDTLS_SSL_PROTO_TLS1_2
 #define MBEDTLS_SSL_SERVER_NAME_INDICATION
 
-// Use a smaller output buffer to reduce size of SSL context.
+// Use a smaller output buffer to reduce size of SSL context
 #define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
 #define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
 #define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
 
-// Enable mbedtls modules.
+// Enable mbedtls modules
 #define MBEDTLS_AES_C
 #define MBEDTLS_ASN1_PARSE_C
 #define MBEDTLS_ASN1_WRITE_C
+#define MBEDTLS_BASE64_C
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
@@ -72,35 +86,30 @@
 #define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
 #define MBEDTLS_ERROR_C
+#define MBEDTLS_GCM_C
 #define MBEDTLS_MD_C
 #define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
 #define MBEDTLS_PKCS5_C
+#define MBEDTLS_PEM_PARSE_C
 #define MBEDTLS_PK_C
 #define MBEDTLS_PK_PARSE_C
 #define MBEDTLS_PLATFORM_C
 #define MBEDTLS_RSA_C
 #define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA224_C
 #define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA384_C
 #define MBEDTLS_SHA512_C
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_DHM_C // needed by DHE_PSK
+#undef MBEDTLS_HAVE_TIME_DATE
 
-// A port may enable this option to select additional bare-metal configuration.
-#if MICROPY_MBEDTLS_CONFIG_BARE_METAL
-
-// Bare-metal mbedtls configuration.
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-
-// Bare-metal memory allocation hooks.
+// Memory allocation hooks
 #include <stdlib.h>
 #include <stdio.h>
 void *m_tracked_calloc(size_t nmemb, size_t size);
@@ -109,6 +118,11 @@ void m_tracked_free(void *ptr);
 #define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
-#endif
+// Time hook
+#include <time.h>
+time_t rp2_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
+
+#include "mbedtls/check_config.h"
 
-#endif // MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */

lib/mbedtls_config/mbedtls_config.h

@@ -45,7 +45,6 @@
 #define MBEDTLS_SHA512_C
 #undef MBEDTLS_HAVE_TIME_DATE
 
-<<<<<<<< HEAD:lib/mbedtls_config/mbedtls_config_hashlib.h
 // Memory allocation hooks
 #include <stdlib.h>
 #include <stdio.h>
@@ -54,13 +53,6 @@ void m_tracked_free(void *ptr);
 #define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
 #define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
-========
-// Time hook
-#include <time.h>
-time_t rp2_rtctime_seconds(time_t *timer);
-#define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
-#define MBEDTLS_PLATFORM_MS_TIME_ALT mbedtls_ms_time
->>>>>>>> v1.23.0:lib/mbedtls_config/mbedtls_config_port.h
 
 #include "mbedtls/check_config.h"
 

lib/mbedtls_config/mbedtls_config_hashlib.h

@@ -25,22 +25,23 @@
  */
 #include <py/mpconfig.h>
 
-// CIRCUITPY-CHANGE: CIRCUITPY_SSL_MBEDTLS instead of MICROPY_SSL_MBEDTLS
 #if CIRCUITPY_SSL_MBEDTLS
 
-#include "mbedtls_config_port.h"
+#include "mbedtls_config.h"
+#include "mbedtls/entropy_poll.h"
+
+#include "hardware/rtc.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/os/__init__.h"
 
 #include "hardware/rtc.h"
 #include "shared/timeutils/timeutils.h"
-#include "mbedtls/platform_time.h"
 
 extern uint8_t rosc_random_u8(size_t cycles);
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
     *olen = len;
-    for (size_t i = 0; i < len; i++) {
-        output[i] = rosc_random_u8(8);
-    }
+    common_hal_os_urandom(data, len);
     return 0;
 }
 
@@ -50,10 +51,4 @@ time_t rp2_rtctime_seconds(time_t *timer) {
     return timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
 }
 
-mbedtls_ms_time_t mbedtls_ms_time(void) {
-    time_t *tv = NULL;
-    mbedtls_ms_time_t current_ms;
-    current_ms = rp2_rtctime_seconds(tv) * 1000;
-    return current_ms;
-}
 #endif

lib/mbedtls_config/mbedtls_port.c

@@ -120,8 +120,7 @@ static mp_obj_t espcamera_camera_make_new(const mp_obj_type_t *type, size_t n_ar
     mp_int_t jpeg_quality = mp_arg_validate_int_range(args[ARG_jpeg_quality].u_int, 2, 55, MP_QSTR_jpeg_quality);
     mp_int_t framebuffer_count = mp_arg_validate_int_range(args[ARG_framebuffer_count].u_int, 1, 2, MP_QSTR_framebuffer_count);
 
-    espcamera_camera_obj_t *self = m_new_obj_with_finaliser(espcamera_camera_obj_t);
-    self->base.type = &espcamera_camera_type;
+    espcamera_camera_obj_t *self = mp_obj_malloc_with_finaliser(espcamera_camera_obj_t, &espcamera_camera_type);
     common_hal_espcamera_camera_construct(
         self,
         data_pins,

ports/espressif/bindings/espcamera/Camera.c

@@ -260,8 +260,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
             mp_raise_NotImplementedError(MP_ERROR_TEXT("Unsupported socket type"));
     }
 
-    socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
-    sock->base.type = &socketpool_socket_type;
+    socketpool_socket_obj_t *sock = mp_obj_malloc_with_finaliser(socketpool_socket_obj_t, &socketpool_socket_type);
 
     if (!_socketpool_socket(self, family, type, proto, sock)) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("Out of sockets"));
@@ -326,7 +325,9 @@ int socketpool_socket_accept(socketpool_socket_obj_t *self, mp_obj_t *peer_out,
 }
 
 socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_obj_t *self, mp_obj_t *peer_out) {
-    socketpool_socket_obj_t *sock = m_new_obj_with_finaliser(socketpool_socket_obj_t);
+    // Set the socket type only after the socketpool_socket_accept succeeds, so that the
+    // finaliser is not called on a bad socket.
+    socketpool_socket_obj_t *sock = mp_obj_malloc_with_finaliser(socketpool_socket_obj_t, NULL);
     int newsoc = socketpool_socket_accept(self, peer_out, NULL);
 
     if (newsoc > 0) {

ports/espressif/common-hal/socketpool/Socket.c

@@ -746,8 +746,7 @@ socketpool_socket_obj_t *common_hal_socketpool_socket(socketpool_socketpool_obj_
         mp_raise_NotImplementedError(MP_ERROR_TEXT("Only IPv4 sockets supported"));
     }
 
-    socketpool_socket_obj_t *socket = m_new_obj_with_finaliser(socketpool_socket_obj_t);
-    socket->base.type = &socketpool_socket_type;
+    socketpool_socket_obj_t *socket = mp_obj_malloc_with_finaliser(socketpool_socket_obj_t, &socketpool_socket_type);
 
     if (!socketpool_socket(self, family, type, proto, socket)) {
         mp_raise_RuntimeError(MP_ERROR_TEXT("Out of sockets"));
@@ -849,7 +848,8 @@ socketpool_socket_obj_t *common_hal_socketpool_socket_accept(socketpool_socket_o
     mp_obj_t *peer_out) {
     // Create new socket object, do it here because we must not raise an out-of-memory
     // exception when the LWIP concurrency lock is held
-    socketpool_socket_obj_t *accepted = m_new_obj_with_finaliser(socketpool_socket_obj_t);
+    // Don't set the type field: socketpool_socket_reset() will do that when checking for already reset.
+    socketpool_socket_obj_t *accepted = mp_obj_malloc_with_finaliser(socketpool_socket_obj_t, NULL);
     socketpool_socket_reset(accepted);
 
     int ret = socketpool_socket_accept(socket, peer_out, accepted);

ports/raspberrypi/common-hal/socketpool/Socket.c

@@ -189,6 +189,8 @@ static inline uint16_t mp_encode_half_float(float x) {
 
 #elif MICROPY_PY_BUILTINS_FLOAT
 
+// CIRCUITPY-CHANGE: avoid warnings about unused functions
+#if defined(MICROPY_PY_FLOAT_USE_NATIVE_FLT16) && MICROPY_PY_FLOAT_USE_NATIVE_FLT16
 static float mp_decode_half_float(uint16_t hf) {
     union {
         uint32_t i;
@@ -259,6 +261,7 @@ static uint16_t mp_encode_half_float(float x) {
     uint16_t bits = ((fpu.i >> 16) & 0x8000) | (e << 10) | m;
     return bits;
 }
+#endif // defined(MICROPY_PY_FLOAT_USE_NATIVE_FLT16) && MICROPY_PY_FLOAT_USE_NATIVE_FLT16
 
 #endif
 

py/binary.c

@@ -43,6 +43,7 @@ extern void common_hal_mcu_enable_interrupts(void);
 // MicroPython-only options not used by CircuitPython, but present in various files
 // inherited from MicroPython, especially in extmod/
 #define MICROPY_ENABLE_DYNRUNTIME        (0)
+#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE (0)
 #define MICROPY_PY_BLUETOOTH             (0)
 #define MICROPY_PY_LWIP_SLIP             (0)
 #define MICROPY_PY_OS_DUPTERM            (0)

py/circuitpy_mpconfig.h

@@ -72,6 +72,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
 
     rc->kind = MP_CODE_BYTECODE;
     rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
+    rc->is_async = (scope_flags & MP_SCOPE_FLAG_ASYNC) != 0;
     rc->fun_data = code;
     rc->children = children;
 
@@ -134,6 +135,7 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, cons
 
     rc->kind = kind;
     rc->is_generator = (scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0;
+    rc->is_async = (scope_flags & MP_SCOPE_FLAG_ASYNC) != 0;
     rc->fun_data = fun_data;
 
     #if MICROPY_PERSISTENT_CODE_SAVE
@@ -207,9 +209,12 @@ mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_modu
             fun = mp_obj_new_fun_native(def_args, rc->fun_data, context, rc->children);
             // Check for a generator function, and if so change the type of the object
             // CIRCUITPY-CHANGE: distinguish generators and async
-            if ((rc->scope_flags & MP_SCOPE_FLAG_ASYNC) != 0) {
+            #if MICROPY_PY_ASYNC_AWAIT
+            if ((rc->is_async) != 0) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_coro_wrap;
-            } else if ((rc->is_generator) != 0) {
+            } else
+            #endif
+            if ((rc->is_generator) != 0) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_gen_wrap;
             }
             break;
@@ -231,7 +236,7 @@ mp_obj_t mp_make_function_from_proto_fun(mp_proto_fun_t proto_fun, const mp_modu
             // A generator is MP_SCOPE_FLAG_ASYNC | MP_SCOPE_FLAG_GENERATOR,
             // so check for ASYNC first.
             #if MICROPY_PY_ASYNC_AWAIT
-            if ((rc->scope_flags & MP_SCOPE_FLAG_ASYNC) != 0) {
+            if ((rc->is_async) != 0) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_coro_wrap;
             } else
             #endif

py/emitglue.c

@@ -75,6 +75,7 @@ typedef struct _mp_raw_code_t {
     uint8_t proto_fun_indicator[2];
     uint8_t kind; // of type mp_raw_code_kind_t; only 3 bits used
     bool is_generator;
+    bool is_async;
     const void *fun_data;
     struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE
@@ -105,6 +106,7 @@ typedef struct _mp_raw_code_truncated_t {
     uint8_t proto_fun_indicator[2];
     uint8_t kind;
     bool is_generator;
+    bool is_async;
     const void *fun_data;
     struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE

py/emitglue.h

@@ -11,7 +11,7 @@ ifeq ($(MICROPY_PREVIEW_VERSION_2),1)
 CFLAGS += -DMICROPY_PREVIEW_VERSION_2=1
 endif
 
-HELP_BUILD_ERROR ?= "See \033[1;31mAdafruit \"Building CircuitPython\" Learn Guide; Adafruit Discord #circuitpython-dev\033[0m"
+HELP_BUILD_ERROR ?= "See \033[1;31mAdafruit \"Building CircuitPython\" Learn Guide; Adafruit Discord \#circuitpython-dev\033[0m"
 HELP_MPY_LIB_SUBMODULE ?= "\033[1;31mError: micropython-lib submodule is not initialized.\033[0m Run 'make submodules'"
 
 # Extra deps that need to happen before object compilation.