2008-07-28 Marek Habersack <mhabersack@novell.com>

[mono.git] / mono / mini / graph.c

diff --git a/mono/mini/graph.c b/mono/mini/graph.c
index 469aa2fc7338de934ad200f22cb6efb720ff7b49..f77efd9b779650045873bea4342e8ab522ad0b3b 100644 (file)
--- a/mono/mini/graph.c
+++ b/mono/mini/graph.c
@@ -187,8 +187,8 @@ mono_print_label (FILE *fp, MonoInst *tree) {
                fprintf (fp, "[%s]",  tree->inst_newa_class->name);
                mono_print_label (fp, tree->inst_newa_len);
                break;
-       case CEE_CALL:
-       case CEE_CALLVIRT:
+       case OP_CALL:
+       case OP_CALLVIRT:
        case OP_FCALL:
        case OP_FCALLVIRT:
        case OP_LCALL:
@@ -219,14 +219,14 @@ mono_print_label (FILE *fp, MonoInst *tree) {
        }
        case OP_RENAME:
        case OP_RETARG:
-       case CEE_NOP:
-       case CEE_JMP:
-       case CEE_BREAK:
+       case OP_NOP:
+       case OP_JMP:
+       case OP_BREAK:
                break;
-       case CEE_BR:
+       case OP_BR:
                fprintf (fp, "[B%d]", tree->inst_target_bb->block_num);
                break;
-       case CEE_SWITCH:
+       case OP_SWITCH:
        case CEE_ISINST:
        case CEE_CASTCLASS:
        case OP_OUTARG:
@@ -235,6 +235,22 @@ mono_print_label (FILE *fp, MonoInst *tree) {
        case OP_LCALL_REG:
        case OP_VCALL_REG:
        case OP_VOIDCALL_REG:
+       case OP_TRAMPCALL_VTABLE:
+       case OP_CALL_RGCTX:
+       case OP_FCALL_RGCTX:
+       case OP_VOIDCALL_RGCTX:
+       case OP_LCALL_RGCTX:
+       case OP_VCALL_RGCTX:
+       case OP_CALL_REG_RGCTX:
+       case OP_FCALL_REG_RGCTX:
+       case OP_VOIDCALL_REG_RGCTX:
+       case OP_LCALL_REG_RGCTX:
+       case OP_VCALL_REG_RGCTX:
+       case OP_CALLVIRT_IMT:
+       case OP_VOIDCALLVIRT_IMT:
+       case OP_FCALLVIRT_IMT:
+       case OP_LCALLVIRT_IMT:
+       case OP_VCALLVIRT_IMT:
                mono_print_label (fp, tree->inst_left);
                break;
        case CEE_BNE_UN:
@@ -289,7 +305,7 @@ mono_draw_code_cfg (MonoCompile *cfg, FILE *fp)
 
                fprintf (fp, "BB%d [%sshape=record,labeljust=l,label=\"{BB%d|", bb->block_num, color, bb->block_num);
                        
-               for (inst = bb->code; inst; inst = inst->next) {
+               MONO_BB_FOR_EACH_INS (bb, inst) {
                        mono_print_label (fp, inst);
                        fprintf (fp, "\\n");                    
                }