atmel-samd building and passing smoke tets

Author: dhalbert

extmod/vfs_fat.c

@@ -455,6 +455,77 @@ static mp_obj_t vfs_fat_umount(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_umount_obj, vfs_fat_umount);
 
+// CIRCUITPY-CHANGE
+static mp_obj_t vfs_fat_utime(mp_obj_t vfs_in, mp_obj_t path_in, mp_obj_t times_in) {
+    mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
+    const char *path = mp_obj_str_get_str(path_in);
+    if (!mp_obj_is_tuple_compatible(times_in)) {
+        mp_raise_type_arg(&mp_type_TypeError, times_in);
+    }
+
+    mp_obj_t *otimes;
+    mp_obj_get_array_fixed_n(times_in, 2, &otimes);
+
+    // Validate that both elements of the tuple are int and discard the second one
+    int time[2];
+    time[0] = mp_obj_get_int(otimes[0]);
+    time[1] = mp_obj_get_int(otimes[1]);
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_epoch_to_struct_time(time[0], &tm);
+
+    FILINFO fno;
+    fno.fdate = (WORD)(((tm.tm_year - 1980) * 512U) | tm.tm_mon * 32U | tm.tm_mday);
+    fno.ftime = (WORD)(tm.tm_hour * 2048U | tm.tm_min * 32U | tm.tm_sec / 2U);
+    FRESULT res = f_utime(&self->fatfs, path, &fno);
+    if (res != FR_OK) {
+        mp_raise_OSError_fresult(res);
+    }
+
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_utime_obj, vfs_fat_utime);
+
+static mp_obj_t vfs_fat_getreadonly(mp_obj_t self_in) {
+    fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(!filesystem_is_writable_by_python(self));
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getreadonly_obj, vfs_fat_getreadonly);
+
+static MP_PROPERTY_GETTER(fat_vfs_readonly_obj,
+    (mp_obj_t)&fat_vfs_getreadonly_obj);
+
+#if MICROPY_FATFS_USE_LABEL
+static mp_obj_t vfs_fat_getlabel(mp_obj_t self_in) {
+    fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
+    char working_buf[12];
+    FRESULT res = f_getlabel(&self->fatfs, working_buf, NULL);
+    if (res != FR_OK) {
+        mp_raise_OSError_fresult(res);
+    }
+    return mp_obj_new_str(working_buf, strlen(working_buf));
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getlabel_obj, vfs_fat_getlabel);
+
+static mp_obj_t vfs_fat_setlabel(mp_obj_t self_in, mp_obj_t label_in) {
+    fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
+    verify_fs_writable(self);
+    const char *label_str = mp_obj_str_get_str(label_in);
+    FRESULT res = f_setlabel(&self->fatfs, label_str);
+    if (res != FR_OK) {
+        if (res == FR_WRITE_PROTECTED) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Read-only filesystem"));
+        }
+        mp_raise_OSError_fresult(res);
+    }
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_setlabel_obj, vfs_fat_setlabel);
+
+static MP_PROPERTY_GETSET(fat_vfs_label_obj,
+    (mp_obj_t)&fat_vfs_getlabel_obj,
+    (mp_obj_t)&fat_vfs_setlabel_obj);
+#endif
+
 static const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
     // CIRCUITPY-CHANGE: correct name
     #if FF_FS_REENTRANT

ports/stm/mpconfigport_nanbox.h

@@ -311,7 +311,8 @@ void asm_xtensa_l32r(asm_xtensa_t *as, mp_uint_t reg, mp_uint_t label);
 #define ASM_XTENSA_REG_TEMPORARY ASM_XTENSA_REG_A6
 #define ASM_XTENSA_REG_TEMPORARY_WIN ASM_XTENSA_REG_A12
 
-#if GENERIC_ASM_API
+// CIRCUITPY-CHANGE: prevent #if warning
+#if defined(GENERIC_ASM_API) && GENERIC_ASM_API
 
 // The following macros provide a (mostly) arch-independent API to
 // generate native code, and are used by the native emitter.

py/asmxtensa.h

@@ -17,6 +17,10 @@
 // Always 1: defined in circuitpy_mpconfig.mk
 // #define CIRCUITPY (1)
 
+#ifndef MP_SSIZE_MAX
+#define MP_SSIZE_MAX (0x7fffffff)
+#endif
+
 // REPR_C encodes qstrs, 31-bit ints, and 30-bit floats in a single 32-bit word.
 #ifndef MICROPY_OBJ_REPR
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
@@ -303,12 +307,10 @@ typedef long mp_off_t;
 
 #ifdef LONGINT_IMPL_MPZ
 #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
-#define MP_SSIZE_MAX (0x7fffffff)
 #endif
 
 #ifdef LONGINT_IMPL_LONGLONG
 #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
-#define MP_SSIZE_MAX (0x7fffffff)
 #endif
 
 #ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS

py/circuitpy_mpconfig.h

@@ -79,12 +79,16 @@ static bool strictly_equal(mp_obj_t a, mp_obj_t b) {
         #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_COMP_CONST_FLOAT
         if (a_type == &mp_type_float) {
             mp_float_t a_val = mp_obj_float_get(a);
+            // CIRCUITPY-CHANGE: ignore float equal warning
+            #pragma GCC diagnostic push
+            #pragma GCC diagnostic ignored "-Wfloat-equal"
             if (a_val == (mp_float_t)0.0) {
                 // Although 0.0 == -0.0, they are not strictly_equal and
                 // must be stored as two different constants in .mpy files
                 mp_float_t b_val = mp_obj_float_get(b);
                 return signbit(a_val) == signbit(b_val);
             }
+            #pragma GCC diagnostic pop
         }
         #endif
         return true;

py/emitcommon.c

@@ -70,6 +70,7 @@
 #error MICROPY_ENABLE_FINALISER requires MICROPY_ENABLE_GC
 #endif
 
+// CIRCUITPY-CHANGE: Add selective collect support to malloc to optimize GC for large buffers
 #if MICROPY_ENABLE_SELECTIVE_COLLECT
 #error MICROPY_ENABLE_SELECTIVE_COLLECT requires MICROPY_ENABLE_GC
 #endif
@@ -125,32 +126,35 @@ void *m_malloc_helper(size_t num_bytes, uint8_t flags) {
 }
 
 void *m_malloc(size_t num_bytes) {
-    // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE: use helper
     return m_malloc_helper(num_bytes, M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
 }
 
 void *m_malloc_maybe(size_t num_bytes) {
-    // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE: use helper
     return m_malloc_helper(num_bytes, M_MALLOC_COLLECT);
 }
 
 #if MICROPY_ENABLE_FINALISER
 void *m_malloc_with_finaliser(size_t num_bytes) {
-    // CIRCUITPY-CHANGE
+    // CIRCUITPY-CHANGE: use helper
     return m_malloc_helper(num_bytes, M_MALLOC_COLLECT | M_MALLOC_WITH_FINALISER);
+}
 #endif
 
 void *m_malloc0(size_t num_bytes) {
-    // CIRCUITPY-CHANGE
-    return m_malloc_helper(num_bytes, M_MALLOC_ENSURE_ZEROED | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
+    // CIRCUITPY-CHANGE: use helper
+    return m_malloc_helper(num_bytes,
+     (MICROPY_GC_CONSERVATIVE_CLEAR ? 0 : M_MALLOC_ENSURE_ZEROED)
+     | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
 }
 
-// CIRCUITPY-CHANGE: selective collect
+// CIRCUITPY-CHANGE: add selective collect
 void *m_malloc_without_collect(size_t num_bytes) {
     return m_malloc_helper(num_bytes, M_MALLOC_RAISE_ERROR);
 }
 
-// CIRCUITPY-CHANGE: selective collect
+// CIRCUITPY-CHANGE: add selective collect
 void *m_malloc_maybe_without_collect(size_t num_bytes) {
 
     return m_malloc_helper(num_bytes, 0);

py/malloc.c

@@ -35,7 +35,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#if __cplusplus // Required on at least one compiler to get ULLONG_MAX
+// CIRCUITPY-CHANGE: #ifdef instead of #if
+#ifdef __cplusplus // Required on at least one compiler to get ULLONG_MAX
 #include <climits>
 #else
 #include <limits.h>
@@ -84,7 +85,8 @@ typedef unsigned int uint;
 #if defined(_MSC_VER) || defined(__cplusplus)
 #define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)1)
 #else
-// CIRCUITPY-CHANGE: defined()#if defined(__clang__)
+// CIRCUITPY-CHANGE: defined()
+#if defined(__clang__)
 #pragma GCC diagnostic ignored "-Wgnu-folding-constant"
 #endif
 #define MP_STATIC_ASSERT_NONCONSTEXPR(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
@@ -456,8 +458,6 @@ static inline uint32_t mp_popcount(uint32_t x) {
 #define mp_clzll(x) __builtin_clzll(x)
 #define mp_ctz(x) __builtin_ctz(x)
 #define mp_check(x) (x)
-// CIRCUITPY-CHANGE: defined()
-#if defined __has_builtin
 #if __has_builtin(__builtin_popcount)
 #define mp_popcount(x) __builtin_popcount(x)
 #else

py/misc.h

@@ -2384,7 +2384,6 @@ typedef time_t mp_timestamp_t;
 #ifndef MP_NORETURN
 #define MP_NORETURN __attribute__((noreturn))
 #endif
-#endif // INT_FMT
 
 #if !MICROPY_PREVIEW_VERSION_2
 #define NORETURN MP_NORETURN
@@ -2435,6 +2434,11 @@ typedef time_t mp_timestamp_t;
 #define MP_COLD __attribute__((cold))
 #endif
 
+// CIRCUITPY-CHANGE: avoid undefined warnings
+#ifndef MICROPY_HAL_HAS_STDIO_MODE_SWITCH
+#define MICROPY_HAL_HAS_STDIO_MODE_SWITCH (0)
+#endif
+
 // To annotate that code is unreachable
 #ifndef MP_UNREACHABLE
 #if defined(__GNUC__)