projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Register static rgctx trampolines
[mono.git]
/
mono
/
mini
/
ir-emit.h
diff --git
a/mono/mini/ir-emit.h
b/mono/mini/ir-emit.h
index 67d073448d3fbdf9b440e87c663538ce8a7d9e7f..59654ee902875458b9aa814f6dc22c194f449b49 100644
(file)
--- a/
mono/mini/ir-emit.h
+++ b/
mono/mini/ir-emit.h
@@
-339,7
+339,7
@@
handle_gsharedvt_ldaddr (MonoCompile *cfg)
(dest)->klass = (var)->klass; \
(dest)->dreg = alloc_dreg ((cfg), STACK_MP); \
(cfg)->has_indirection = TRUE; \
(dest)->klass = (var)->klass; \
(dest)->dreg = alloc_dreg ((cfg), STACK_MP); \
(cfg)->has_indirection = TRUE; \
- if (G_UNLIKELY (cfg->gsharedvt) && mini_is_gsharedvt_variable_type ((
cfg), (
var)->inst_vtype)) { handle_gsharedvt_ldaddr ((cfg)); } \
+ if (G_UNLIKELY (cfg->gsharedvt) && mini_is_gsharedvt_variable_type ((var)->inst_vtype)) { handle_gsharedvt_ldaddr ((cfg)); } \
if (SIZEOF_REGISTER == 4 && DECOMPOSE_INTO_REGPAIR ((var)->type)) { MonoInst *var1 = get_vreg_to_inst (cfg, (var)->dreg + 1); MonoInst *var2 = get_vreg_to_inst (cfg, (var)->dreg + 2); g_assert (var1); g_assert (var2); var1->flags |= MONO_INST_INDIRECT; var2->flags |= MONO_INST_INDIRECT; } \
} while (0)
if (SIZEOF_REGISTER == 4 && DECOMPOSE_INTO_REGPAIR ((var)->type)) { MonoInst *var1 = get_vreg_to_inst (cfg, (var)->dreg + 1); MonoInst *var2 = get_vreg_to_inst (cfg, (var)->dreg + 2); g_assert (var1); g_assert (var2); var1->flags |= MONO_INST_INDIRECT; var2->flags |= MONO_INST_INDIRECT; } \
} while (0)
@@
-408,7
+408,7
@@
handle_gsharedvt_ldaddr (MonoCompile *cfg)
} while (0)
#define NEW_SEQ_POINT(cfg,dest,il_offset,intr_loc) do { \
} while (0)
#define NEW_SEQ_POINT(cfg,dest,il_offset,intr_loc) do { \
- MONO_INST_NEW ((cfg), (dest), cfg->gen_s
eq_points_debug_data
? OP_SEQ_POINT : OP_IL_SEQ_POINT); \
+ MONO_INST_NEW ((cfg), (dest), cfg->gen_s
db_seq_points
? OP_SEQ_POINT : OP_IL_SEQ_POINT); \
(dest)->inst_imm = (il_offset); \
(dest)->flags = intr_loc ? MONO_INST_SINGLE_STEP_LOC : 0; \
} while (0)
(dest)->inst_imm = (il_offset); \
(dest)->flags = intr_loc ? MONO_INST_SINGLE_STEP_LOC : 0; \
} while (0)
@@
-754,8
+754,8
@@
handle_gsharedvt_ldaddr (MonoCompile *cfg)
(b)->real_offset = cfg->real_offset; \
} while (0)
(b)->real_offset = cfg->real_offset; \
} while (0)
-/*
Emit a one-way conditional branch */
-/*
+/*
+ * Emit a one-way conditional branch and start a new bblock.
* The inst_false_bb field of the cond branch will not be set, the JIT code should be
* prepared to deal with this.
*/
* The inst_false_bb field of the cond branch will not be set, the JIT code should be
* prepared to deal with this.
*/