if (!tls) {
/* Happens during startup */
- tls->unwind_state.valid = FALSE;
return;
}
gboolean res;
g_assert (tls->info);
+#ifdef TARGET_WIN32
+ return;
+#else
res = mono_thread_state_init_from_handle (&tls->unwind_state, (MonoNativeThreadId)tls->tid, tls->info->native_handle);
+#endif
} else {
tls->unwind_state.unwind_data [MONO_UNWIND_DATA_LMF] = mono_get_lmf ();
if (sigctx) {
+#ifdef MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX
mono_arch_sigctx_to_monoctx (sigctx, &tls->unwind_state.ctx);
tls->unwind_state.valid = TRUE;
+#else
+ tls->unwind_state.valid = FALSE;
+#endif
} else if (ctx) {
memcpy (&tls->unwind_state.ctx, ctx, sizeof (MonoContext));
tls->unwind_state.valid = TRUE;
conservative_pass (TlsData *tls, guint8 *stack_start, guint8 *stack_end)
{
MonoJitInfo *ji;
+ MonoMethod *method;
MonoContext ctx, new_ctx;
MonoLMF *lmf;
guint8 *stack_limit;
ji = frame.ji;
+ // FIXME: For skipped frames, scan the param area of the parent frame conservatively ?
+
if (frame.type == FRAME_TYPE_MANAGED_TO_NATIVE) {
/*
* These frames are problematic for several reasons:
continue;
}
+ if (ji)
+ method = jinfo_get_method (ji);
+ else
+ method = NULL;
+
/* The last frame can be in any state so mark conservatively */
if (last) {
if (ji) {
- DEBUG (char *fname = mono_method_full_name (ji->method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
+ DEBUG (char *fname = mono_method_full_name (method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
}
DEBUG (fprintf (logfile, "\t <Last frame>\n"));
last = FALSE;
pc_offset = (guint8*)MONO_CONTEXT_GET_IP (&ctx) - (guint8*)ji->code_start;
/* These frames are very problematic */
- if (ji->method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE) {
- DEBUG (char *fname = mono_method_full_name (ji->method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
+ if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE) {
+ DEBUG (char *fname = mono_method_full_name (method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
DEBUG (fprintf (logfile, "\tSkip.\n"));
continue;
}
emap = ji->gc_info;
if (!emap) {
- DEBUG (char *fname = mono_method_full_name (ji->method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
+ DEBUG (char *fname = mono_method_full_name (jinfo_get_method (ji), TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx)); g_free (fname));
DEBUG (fprintf (logfile, "\tNo GC Map.\n"));
continue;
}
* Debugging aid to control the number of frames scanned precisely
*/
if (!precise_frame_limit_inited) {
- if (getenv ("MONO_PRECISE_COUNT"))
- precise_frame_limit = atoi (getenv ("MONO_PRECISE_COUNT"));
+ if (g_getenv ("MONO_PRECISE_COUNT"))
+ precise_frame_limit = atoi (g_getenv ("MONO_PRECISE_COUNT"));
precise_frame_limit_inited = TRUE;
}
if (precise_frame_limit != -1) {
if (precise_frame_count [FALSE] == precise_frame_limit)
- printf ("LAST PRECISE FRAME: %s\n", mono_method_full_name (ji->method, TRUE));
+ printf ("LAST PRECISE FRAME: %s\n", mono_method_full_name (method, TRUE));
if (precise_frame_count [FALSE] > precise_frame_limit)
continue;
}
frame_start = fp + map->start_offset + map->map_offset;
frame_end = fp + map->end_offset;
- DEBUG (char *fname = mono_method_full_name (ji->method, TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p) limit=%p fp=%p frame=%p-%p (%d)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx), stack_limit, fp, frame_start, frame_end, (int)(frame_end - frame_start)); g_free (fname));
+ DEBUG (char *fname = mono_method_full_name (jinfo_get_method (ji), TRUE); fprintf (logfile, "Mark(0): %s+0x%x (%p) limit=%p fp=%p frame=%p-%p (%d)\n", fname, pc_offset, (gpointer)MONO_CONTEXT_GET_IP (&ctx), stack_limit, fp, frame_start, frame_end, (int)(frame_end - frame_start)); g_free (fname));
/* Find the callsite index */
if (map->callsite_entry_size == 1) {
break;
}
if (i == map->ncallsites) {
- printf ("Unable to find ip offset 0x%x in callsite list of %s.\n", pc_offset + 1, mono_method_full_name (ji->method, TRUE));
+ printf ("Unable to find ip offset 0x%x in callsite list of %s.\n", pc_offset + 1, mono_method_full_name (method, TRUE));
g_assert_not_reached ();
}
cindex = i;
fi = &tls->frames [findex];
frame_start = stack_start + fi->frame_start_offset;
- DEBUG (char *fname = mono_method_full_name (fi->ji->method, TRUE); fprintf (logfile, "Mark(1): %s\n", fname); g_free (fname));
+ DEBUG (char *fname = mono_method_full_name (jinfo_get_method (fi->ji), TRUE); fprintf (logfile, "Mark(1): %s\n", fname); g_free (fname));
/*
* FIXME: Add a function to mark using a bitmap, to avoid doing a
precise_pass (tls, stack_start, stack_end);
}
+#ifndef DISABLE_JIT
+
static void
mini_gc_init_gc_map (MonoCompile *cfg)
{
static int precise_count;
precise_count ++;
- if (getenv ("MONO_GCMAP_COUNT")) {
- if (precise_count == atoi (getenv ("MONO_GCMAP_COUNT")))
+ if (g_getenv ("MONO_GCMAP_COUNT")) {
+ if (precise_count == atoi (g_getenv ("MONO_GCMAP_COUNT")))
printf ("LAST: %s\n", mono_method_full_name (cfg->method, TRUE));
- if (precise_count > atoi (getenv ("MONO_GCMAP_COUNT")))
+ if (precise_count > atoi (g_getenv ("MONO_GCMAP_COUNT")))
return;
}
}
return (slot * SIZEOF_SLOT) + gcfg->min_offset;
}
-static inline void
+static inline MONO_ALWAYS_INLINE void
set_slot (MonoCompileGC *gcfg, int slot, int callsite_index, GCSlotType type)
{
g_assert (slot >= 0 && slot < gcfg->nslots);
if (type == SLOT_PIN) {
- clear_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
- set_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
+ clear_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
+ set_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
} else if (type == SLOT_REF) {
- set_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
- clear_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
+ set_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
+ clear_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
} else if (type == SLOT_NOREF) {
- clear_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
- clear_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, callsite_index, slot);
+ clear_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
+ clear_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, slot, callsite_index);
}
}
static inline void
set_slot_everywhere (MonoCompileGC *gcfg, int slot, GCSlotType type)
{
+ int width, pos;
+ guint8 *ref_bitmap, *pin_bitmap;
+
+ /*
int cindex;
for (cindex = 0; cindex < gcfg->ncallsites; ++cindex)
set_slot (gcfg, slot, cindex, type);
+ */
+ ref_bitmap = gcfg->stack_ref_bitmap;
+ pin_bitmap = gcfg->stack_pin_bitmap;
+ width = gcfg->stack_bitmap_width;
+ pos = width * slot;
+
+ if (type == SLOT_PIN) {
+ memset (ref_bitmap + pos, 0, width);
+ memset (pin_bitmap + pos, 0xff, width);
+ } else if (type == SLOT_REF) {
+ memset (ref_bitmap + pos, 0xff, width);
+ memset (pin_bitmap + pos, 0, width);
+ } else if (type == SLOT_NOREF) {
+ memset (ref_bitmap + pos, 0, width);
+ memset (pin_bitmap + pos, 0, width);
+ }
}
static inline void
g_assert (slot >= 0 && slot < gcfg->nregs);
if (type == SLOT_PIN) {
- clear_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
- set_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
+ clear_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
+ set_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
} else if (type == SLOT_REF) {
- set_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
- clear_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
+ set_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
+ clear_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
} else if (type == SLOT_NOREF) {
- clear_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
- clear_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, callsite_index, slot);
+ clear_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
+ clear_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, slot, callsite_index);
}
}
if (ins->inst_offset % SIZEOF_SLOT != 0)
continue;
- if (is_arg && ins->inst_offset >= gcfg->max_offset)
- /* In parent frame */
- continue;
-
pos = fp_offset_to_slot (cfg, ins->inst_offset);
if (is_arg && ins->flags & MONO_INST_IS_DEAD) {
* before the liveness pass. We emit OP_GC_LIVENESS_DEF instructions for
* them during VZERO decomposition.
*/
- if (!pc_offsets [vmv->vreg])
- pin = TRUE;
+ if (!is_arg) {
+ if (!pc_offsets [vmv->vreg])
+ pin = TRUE;
- if (ins->backend.is_pinvoke)
- pin = TRUE;
+ if (ins->backend.is_pinvoke)
+ pin = TRUE;
+ }
if (bitmap) {
for (cindex = 0; cindex < gcfg->ncallsites; ++cindex) {
if (!mini_type_is_reference (cfg, t)) {
set_slot_everywhere (gcfg, pos, SLOT_NOREF);
if (cfg->verbose_level > 1)
- printf ("\tnoref at %s0x%x(fp) (R%d, slot = %d): %s\n", ins->inst_offset < 0 ? "-" : "", (ins->inst_offset < 0) ? -(int)ins->inst_offset : (int)ins->inst_offset, vmv->vreg, pos, mono_type_full_name (ins->inst_vtype));
+ printf ("\tnoref%s at %s0x%x(fp) (R%d, slot = %d): %s\n", (is_arg ? " arg" : ""), ins->inst_offset < 0 ? "-" : "", (ins->inst_offset < 0) ? -(int)ins->inst_offset : (int)ins->inst_offset, vmv->vreg, pos, mono_type_full_name (ins->inst_vtype));
if (!t->byref && sizeof (mgreg_t) == 4 && (t->type == MONO_TYPE_I8 || t->type == MONO_TYPE_U8 || t->type == MONO_TYPE_R8)) {
set_slot_everywhere (gcfg, pos + 1, SLOT_NOREF);
if (cfg->verbose_level > 1)
}
if (cfg->verbose_level > 1) {
- printf ("\tref at %s0x%x(fp) (R%d, slot = %d): %s\n", ins->inst_offset < 0 ? "-" : "", (ins->inst_offset < 0) ? -(int)ins->inst_offset : (int)ins->inst_offset, vmv->vreg, pos, mono_type_full_name (ins->inst_vtype));
+ printf ("\tref%s at %s0x%x(fp) (R%d, slot = %d): %s\n", (is_arg ? " arg" : ""), ins->inst_offset < 0 ? "-" : "", (ins->inst_offset < 0) ? -(int)ins->inst_offset : (int)ins->inst_offset, vmv->vreg, pos, mono_type_full_name (ins->inst_vtype));
}
}
#endif
}
-static GCSlotType
-type_to_gc_slot_type (MonoCompile *cfg, MonoType *t)
-{
- if (t->byref)
- return SLOT_PIN;
- t = mini_type_get_underlying_type (NULL, t);
- if (mini_type_is_reference (cfg, t))
- return SLOT_REF;
- else {
- if (MONO_TYPE_ISSTRUCT (t)) {
- MonoClass *klass = mono_class_from_mono_type (t);
- if (!klass->has_references) {
- return SLOT_NOREF;
- } else {
- // FIXME:
- return SLOT_PIN;
- }
- }
- return SLOT_NOREF;
- }
-}
-
static void
process_param_area_slots (MonoCompile *cfg)
{
set_slot_everywhere (gcfg, i, SLOT_NOREF);
}
- for (cindex = 0; cindex < gcfg->ncallsites; ++cindex) {
- GCCallSite *callsite = gcfg->callsites [cindex];
- GSList *l;
-
- for (l = callsite->param_slots; l; l = l->next) {
- MonoInst *def = l->data;
- MonoType *t = def->inst_vtype;
- int sp_offset = def->inst_offset;
- int fp_offset = sp_offset_to_fp_offset (cfg, sp_offset);
- int slot = fp_offset_to_slot (cfg, fp_offset);
- GCSlotType type = type_to_gc_slot_type (cfg, t);
-
- if (MONO_TYPE_ISSTRUCT (t)) {
- guint32 align;
- guint32 size;
- int size_in_slots;
- gsize *bitmap;
- int j, numbits;
-
- size = mini_type_stack_size_full (cfg->generic_sharing_context, t, &align, FALSE);
- size_in_slots = ALIGN_TO (size, SIZEOF_SLOT) / SIZEOF_SLOT;
-
- bitmap = get_vtype_bitmap (t, &numbits);
- if (type == SLOT_NOREF || !bitmap) {
- for (i = 0; i < size_in_slots; ++i) {
- set_slot_in_range (gcfg, slot + i, def->backend.pc_offset, callsite->pc_offset + 1, type);
- }
- if (cfg->verbose_level > 1)
- printf ("\t%s param area slots at %s0x%x(fp)=0x%x(sp) (slot = %d-%d) [0x%x-0x%x]\n", slot_type_to_string (type), get_offset_sign (fp_offset), get_offset_val (fp_offset), sp_offset, slot, slot + (size / (int)sizeof (mgreg_t)), def->backend.pc_offset, callsite->pc_offset + 1);
- } else {
- for (j = 0; j < numbits; ++j) {
- if (bitmap [j / GC_BITS_PER_WORD] & ((gsize)1 << (j % GC_BITS_PER_WORD))) {
- /* The descriptor is for the boxed object */
- set_slot (gcfg, (slot + j - (sizeof (MonoObject) / SIZEOF_SLOT)), cindex, SLOT_REF);
- }
- }
- if (cfg->verbose_level > 1)
- printf ("\tvtype param area slots at %s0x%x(fp)=0x%x(sp) (slot = %d-%d) [0x%x-0x%x]\n", get_offset_sign (fp_offset), get_offset_val (fp_offset), sp_offset, slot, slot + (size / (int)sizeof (mgreg_t)), def->backend.pc_offset, callsite->pc_offset + 1);
- }
- g_free (bitmap);
- } else {
- /* The slot is live between the def instruction and the call */
- set_slot_in_range (gcfg, slot, def->backend.pc_offset, callsite->pc_offset + 1, type);
- if (cfg->verbose_level > 1)
- printf ("\t%s param area slot at %s0x%x(fp)=0x%x(sp) (slot = %d) [0x%x-0x%x]\n", slot_type_to_string (type), get_offset_sign (fp_offset), get_offset_val (fp_offset), sp_offset, slot, def->backend.pc_offset, callsite->pc_offset + 1);
- }
- }
- }
+ /*
+ * We treat param area slots as being part of the callee's frame, to be able to handle tail calls which overwrite
+ * the argument area of the caller.
+ */
}
static void
for (i = 0; i < sig->param_count + sig->hasthis; ++i) {
MonoInst *ins = cfg->args [i];
- if (ins->opcode == OP_REGOFFSET)
+ if (ins->opcode == OP_REGOFFSET) {
+ int size, size_in_slots;
+ size = mini_type_stack_size_full (cfg->generic_sharing_context, ins->inst_vtype, NULL, ins->backend.is_pinvoke);
+ size_in_slots = ALIGN_TO (size, SIZEOF_SLOT) / SIZEOF_SLOT;
+
min_offset = MIN (min_offset, ins->inst_offset);
+ max_offset = MAX ((int)max_offset, (int)(ins->inst_offset + (size_in_slots * SIZEOF_SLOT)));
+ }
}
/* Cfa slots */
gcfg->nregs = nregs;
gcfg->callsites = callsites;
gcfg->ncallsites = ncallsites;
- gcfg->stack_bitmap_width = ALIGN_TO (nslots, 8) / 8;
- gcfg->reg_bitmap_width = ALIGN_TO (nregs, 8) / 8;
- gcfg->stack_ref_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->stack_bitmap_width * ncallsites);
- gcfg->stack_pin_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->stack_bitmap_width * ncallsites);
- gcfg->reg_ref_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->reg_bitmap_width * ncallsites);
- gcfg->reg_pin_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->reg_bitmap_width * ncallsites);
+ gcfg->stack_bitmap_width = ALIGN_TO (ncallsites, 8) / 8;
+ gcfg->reg_bitmap_width = ALIGN_TO (ncallsites, 8) / 8;
+ gcfg->stack_ref_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->stack_bitmap_width * nslots);
+ gcfg->stack_pin_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->stack_bitmap_width * nslots);
+ gcfg->reg_ref_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->reg_bitmap_width * nregs);
+ gcfg->reg_pin_bitmap = mono_mempool_alloc0 (cfg->mempool, gcfg->reg_bitmap_width * nregs);
/* All slots start out as PIN */
- memset (gcfg->stack_pin_bitmap, 0xff, gcfg->stack_bitmap_width * ncallsites);
+ memset (gcfg->stack_pin_bitmap, 0xff, gcfg->stack_bitmap_width * nregs);
for (i = 0; i < nregs; ++i) {
/*
* By default, registers are NOREF.
}
}
+static inline gboolean
+has_bit_set (guint8 *bitmap, int width, int slot)
+{
+ int i;
+ int pos = width * slot;
+
+ for (i = 0; i < width; ++i) {
+ if (bitmap [pos + i])
+ break;
+ }
+ return i < width;
+}
+
static void
create_map (MonoCompile *cfg)
{
gboolean has_ref = FALSE;
gboolean has_pin = FALSE;
- for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, j, i))
- has_pin = TRUE;
- if (get_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, j, i))
- has_ref = TRUE;
- }
+ if (has_bit_set (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, i))
+ has_pin = TRUE;
+ if (has_bit_set (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, i))
+ has_ref = TRUE;
if (has_ref)
has_ref_slots = TRUE;
if (!(cfg->used_int_regs & (1 << i)))
continue;
- for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, j, i)) {
- has_ref = TRUE;
- break;
- }
- }
- for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, j, i)) {
- has_pin = TRUE;
- break;
- }
- }
+ if (has_bit_set (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, i))
+ has_pin = TRUE;
+ if (has_bit_set (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, i))
+ has_ref = TRUE;
if (has_ref) {
reg_ref_mask |= (1 << i);
/* Create the GC Map */
+ /* The work bitmaps have one row for each slot, since this is how we access them during construction */
stack_bitmap_width = ALIGN_TO (end - start, 8) / 8;
stack_bitmap_size = stack_bitmap_width * ncallsites;
reg_ref_bitmap_width = ALIGN_TO (nref_regs, 8) / 8;
bitmap = &bitmaps [map->stack_ref_bitmap_offset];
for (i = 0; i < nslots; ++i) {
for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, j, i))
+ if (get_bit (gcfg->stack_ref_bitmap, gcfg->stack_bitmap_width, i, j))
set_bit (bitmap, stack_bitmap_width, j, i - start);
}
}
bitmap = &bitmaps [map->stack_pin_bitmap_offset];
for (i = 0; i < nslots; ++i) {
for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, j, i))
+ if (get_bit (gcfg->stack_pin_bitmap, gcfg->stack_bitmap_width, i, j))
set_bit (bitmap, stack_bitmap_width, j, i - start);
}
}
for (i = 0; i < nregs; ++i) {
if (reg_ref_mask & (1 << i)) {
for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, j, i))
+ if (get_bit (gcfg->reg_ref_bitmap, gcfg->reg_bitmap_width, i, j))
set_bit (bitmap, reg_ref_bitmap_width, j, bindex);
}
bindex ++;
for (i = 0; i < nregs; ++i) {
if (reg_pin_mask & (1 << i)) {
for (j = 0; j < ncallsites; ++j) {
- if (get_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, j, i))
+ if (get_bit (gcfg->reg_pin_bitmap, gcfg->reg_bitmap_width, i, j))
set_bit (bitmap, reg_pin_bitmap_width, j, bindex);
}
bindex ++;
create_map (cfg);
}
+#endif /* DISABLE_JIT */
+
static void
parse_debug_options (void)
{
char **opts, **ptr;
- char *env;
+ const char *env;
- env = getenv ("MONO_GCMAP_DEBUG");
+ env = g_getenv ("MONO_GCMAP_DEBUG");
if (!env)
return;
#else
+void
+mini_gc_enable_gc_maps_for_aot (void)
+{
+}
+
void
mini_gc_init (void)
{
}
+#ifndef DISABLE_JIT
+
static void
mini_gc_init_gc_map (MonoCompile *cfg)
{
{
}
+#endif /* DISABLE_JIT */
+
#endif
+#ifndef DISABLE_JIT
+
/*
* mini_gc_init_cfg:
*
mini_gc_init_gc_map (cfg);
}
+#endif /* DISABLE_JIT */
+
/*
* Problems with the current code:
* - the stack walk is slow
projects / mono.git / blobdiff