34a7d7ebeb
When building with link time optimization enabled it is possible both gc_collect() and gc_collect_regs_and_stack() get inlined into gc_alloc() which can result in the regs variable being pushed on the stack earlier than some of the registers. Depending on the calling convention, those registers might however contain pointers to blocks which have just been allocated in the caller of gc_alloc(). Then those pointers end up higher on the stack than regs, aren't marked by gc_collect_root() and hence get sweeped, even though they're still in use. As reported in #4652 this happened for in 32-bit msvc release builds: mp_lexer_new() does two consecutive allocations and the latter triggered a gc_collect() which would sweep the memory of the first allocation again.
185 lines
5.5 KiB
C
185 lines
5.5 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 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
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "py/mpstate.h"
|
|
#include "py/gc.h"
|
|
|
|
#if MICROPY_ENABLE_GC
|
|
|
|
// Even if we have specific support for an architecture, it is
|
|
// possible to force use of setjmp-based implementation.
|
|
#if !MICROPY_GCREGS_SETJMP
|
|
|
|
// We capture here callee-save registers, i.e. ones which may contain
|
|
// interesting values held there by our callers. It doesn't make sense
|
|
// to capture caller-saved registers, because they, well, put on the
|
|
// stack already by the caller.
|
|
#if defined(__x86_64__)
|
|
typedef mp_uint_t regs_t[6];
|
|
|
|
STATIC void gc_helper_get_regs(regs_t arr) {
|
|
register long rbx asm ("rbx");
|
|
register long rbp asm ("rbp");
|
|
register long r12 asm ("r12");
|
|
register long r13 asm ("r13");
|
|
register long r14 asm ("r14");
|
|
register long r15 asm ("r15");
|
|
#ifdef __clang__
|
|
// TODO:
|
|
// This is dirty workaround for Clang. It tries to get around
|
|
// uncompliant (wrt to GCC) behavior of handling register variables.
|
|
// Application of this patch here is random, and done only to unbreak
|
|
// MacOS build. Better, cross-arch ways to deal with Clang issues should
|
|
// be found.
|
|
asm("" : "=r"(rbx));
|
|
asm("" : "=r"(rbp));
|
|
asm("" : "=r"(r12));
|
|
asm("" : "=r"(r13));
|
|
asm("" : "=r"(r14));
|
|
asm("" : "=r"(r15));
|
|
#endif
|
|
arr[0] = rbx;
|
|
arr[1] = rbp;
|
|
arr[2] = r12;
|
|
arr[3] = r13;
|
|
arr[4] = r14;
|
|
arr[5] = r15;
|
|
}
|
|
|
|
#elif defined(__i386__)
|
|
|
|
typedef mp_uint_t regs_t[4];
|
|
|
|
STATIC void gc_helper_get_regs(regs_t arr) {
|
|
register long ebx asm ("ebx");
|
|
register long esi asm ("esi");
|
|
register long edi asm ("edi");
|
|
register long ebp asm ("ebp");
|
|
#ifdef __clang__
|
|
// TODO:
|
|
// This is dirty workaround for Clang. It tries to get around
|
|
// uncompliant (wrt to GCC) behavior of handling register variables.
|
|
// Application of this patch here is random, and done only to unbreak
|
|
// MacOS build. Better, cross-arch ways to deal with Clang issues should
|
|
// be found.
|
|
asm("" : "=r"(ebx));
|
|
asm("" : "=r"(esi));
|
|
asm("" : "=r"(edi));
|
|
asm("" : "=r"(ebp));
|
|
#endif
|
|
arr[0] = ebx;
|
|
arr[1] = esi;
|
|
arr[2] = edi;
|
|
arr[3] = ebp;
|
|
}
|
|
|
|
#elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
|
|
|
|
typedef mp_uint_t regs_t[10];
|
|
|
|
STATIC void gc_helper_get_regs(regs_t arr) {
|
|
register long r4 asm ("r4");
|
|
register long r5 asm ("r5");
|
|
register long r6 asm ("r6");
|
|
register long r7 asm ("r7");
|
|
register long r8 asm ("r8");
|
|
register long r9 asm ("r9");
|
|
register long r10 asm ("r10");
|
|
register long r11 asm ("r11");
|
|
register long r12 asm ("r12");
|
|
register long r13 asm ("r13");
|
|
arr[0] = r4;
|
|
arr[1] = r5;
|
|
arr[2] = r6;
|
|
arr[3] = r7;
|
|
arr[4] = r8;
|
|
arr[5] = r9;
|
|
arr[6] = r10;
|
|
arr[7] = r11;
|
|
arr[8] = r12;
|
|
arr[9] = r13;
|
|
}
|
|
|
|
#else
|
|
|
|
// If we don't have architecture-specific optimized support,
|
|
// just fall back to setjmp-based implementation.
|
|
#undef MICROPY_GCREGS_SETJMP
|
|
#define MICROPY_GCREGS_SETJMP (1)
|
|
|
|
#endif // Arch-specific selection
|
|
#endif // !MICROPY_GCREGS_SETJMP
|
|
|
|
// If MICROPY_GCREGS_SETJMP was requested explicitly, or if
|
|
// we enabled it as a fallback above.
|
|
#if MICROPY_GCREGS_SETJMP
|
|
#include <setjmp.h>
|
|
|
|
typedef jmp_buf regs_t;
|
|
|
|
STATIC void gc_helper_get_regs(regs_t arr) {
|
|
setjmp(arr);
|
|
}
|
|
|
|
#endif // MICROPY_GCREGS_SETJMP
|
|
|
|
// this function is used by mpthreadport.c
|
|
MP_NOINLINE void gc_collect_regs_and_stack(void);
|
|
|
|
// Explicitly mark this as noinline to make sure the regs variable
|
|
// is effectively at the top of the stack: otherwise, in builds where
|
|
// LTO is enabled and a lot of inlining takes place we risk a stack
|
|
// layout where regs is lower on the stack than pointers which have
|
|
// just been allocated but not yet marked, and get incorrectly sweeped.
|
|
MP_NOINLINE void gc_collect_regs_and_stack(void) {
|
|
regs_t regs;
|
|
gc_helper_get_regs(regs);
|
|
// GC stack (and regs because we captured them)
|
|
void **regs_ptr = (void**)(void*)®s;
|
|
gc_collect_root(regs_ptr, ((uintptr_t)MP_STATE_THREAD(stack_top) - (uintptr_t)®s) / sizeof(uintptr_t));
|
|
}
|
|
|
|
void gc_collect(void) {
|
|
//gc_dump_info();
|
|
|
|
gc_collect_start();
|
|
gc_collect_regs_and_stack();
|
|
#if MICROPY_PY_THREAD
|
|
mp_thread_gc_others();
|
|
#endif
|
|
#if MICROPY_EMIT_NATIVE
|
|
mp_unix_mark_exec();
|
|
#endif
|
|
gc_collect_end();
|
|
|
|
//printf("-----\n");
|
|
//gc_dump_info();
|
|
}
|
|
|
|
#endif //MICROPY_ENABLE_GC
|