Bodge in enough phi support to let the instruction generator complete on basic

programs.

mach/proto/mcg/basicblock.h

@@ -12,6 +12,8 @@ struct basicblock
     ARRAYOF(struct basicblock) nexts;
     int order; /* used by SSA code */
 
+	ARRAYOF(struct vreg) liveins;
+
     bool is_fake : 1;
     bool is_root : 1;
     bool is_terminated : 1;

mach/proto/mcg/pass_instructionselection.c

@@ -191,6 +191,20 @@ static void select_instructions(void)
 		int insnno;
 
 		current_ir = current_bb->irs.item[i];
+
+        if (current_ir->opcode == IR_PHI)
+        {
+            int j;
+
+            current_ir->result = new_vreg();
+            array_append(&current_bb->liveins, current_ir->result);
+            tracef('I', "I: %d is phi:", current_ir->result->id);
+            for (j=0; j<current_ir->u.phivalue.count; j++)
+                tracef('I', " $%d", current_ir->u.phivalue.item[j]->id);
+            tracef('I', "\n");
+        }
+        else
+        {
             shadow = build_shadow_tree(current_ir, current_ir);
             burm_label(shadow);
 
@@ -201,6 +215,7 @@ static void select_instructions(void)
             ir_print('I', current_ir);
             walk_instructions(shadow, 1);
         }
+	}
 }
 
 void pass_instruction_selector(struct procedure* proc)

mach/proto/mcg/table

@@ -62,6 +62,7 @@ PATTERNS
 
 	SETRET4(in:reg)
 		with ret reg
+		emit "mov r0, %in"
 		cost 4;
 
 	STACKADJUST4(delta:aluparam)