Author: zoltan
Date: 2007-05-08 18:05:05 -0400 (Tue, 08 May 2007)
New Revision: 76973
Modified:
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini.h
Log:
2007-05-09 Zoltan Varga <[EMAIL PROTECTED]>
* method-to-ir.c (mono_method_to_ir2): Set cfg->ip while iterating
through
the IL code. Fixes debugging support.
* mini.h (MONO_INST_NEW): Set ins->cil_code automatically using cfg->ip.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-05-08
21:57:21 UTC (rev 76972)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-05-08
22:05:05 UTC (rev 76973)
@@ -1,3 +1,10 @@
+2007-05-09 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * method-to-ir.c (mono_method_to_ir2): Set cfg->ip while iterating
through
+ the IL code. Fixes debugging support.
+
+ * mini.h (MONO_INST_NEW): Set ins->cil_code automatically using cfg->ip.
+
2007-05-07 Zoltan Varga <[EMAIL PROTECTED]>
* mini.c (mini_method_compile): Only decompose_array_access_opts in the
new IR.
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-05-08 21:57:21 UTC (rev 76972)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-05-08 22:05:05 UTC (rev 76973)
@@ -5626,6 +5626,7 @@
NEW_BBLOCK (cfg, bblock);
bblock->cil_code = ip;
cfg->cbb = bblock;
+ cfg->ip = ip;
ADD_BBLOCK (cfg, bblock);
@@ -5764,7 +5765,8 @@
cfg->real_offset = ip - header->code;
else
cfg->real_offset = inline_offset;
-
+ cfg->ip = ip;
+
if (start_new_bblock) {
bblock->cil_length = ip - bblock->cil_code;
if (start_new_bblock == 2) {
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini.h 2007-05-08
21:57:21 UTC (rev 76972)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini.h 2007-05-08
22:05:05 UTC (rev 76973)
@@ -87,12 +87,14 @@
(dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof
(MonoInst)); \
(dest)->opcode = (op); \
(dest)->dreg = (dest)->sreg1 = (dest)->sreg2 = -1; \
+ (dest)->cil_code = (cfg)->ip; \
} while (0)
#define MONO_INST_NEW_CALL(cfg,dest,op) do { \
(dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof
(MonoCallInst)); \
(dest)->inst.opcode = (op); \
(dest)->inst.dreg = (dest)->inst.sreg1 = (dest)->inst.sreg2 = -1; \
+ (dest)->inst.cil_code = (cfg)->ip; \
} while (0)
#define MONO_INST_NEW_CALL_ARG(cfg,dest,op) do { \
@@ -614,6 +616,8 @@
* this is NULL.
*/
MonoInst *vret_addr;
+
+ const unsigned char *ip;
struct MonoAliasingInformation *aliasing_info;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
