diff --git a/test_main.c b/test_main.c
index ca51318..fd99ea9 100644
--- a/test_main.c
+++ b/test_main.c
@@ -24,6 +24,39 @@
 HInstrArray* /* not really, but for the time being ... */
              iselBB ( IRBB* bb );
 
+/* HACK */
+X86Instr* genSpill_X86 ( HReg rreg, Int offset )
+{
+   assert(!hregIsVirtual(rreg));
+   switch (hregClass(rreg)) {
+      case HRcInt:
+        return
+	X86Instr_Alu32M ( Xalu_MOV, X86RI_Reg(rreg), 
+		          X86AMode_IR(offset + 0x1000, 
+                                      hregX86_EBP()));
+      default: 
+         ppHRegClass(stderr, hregClass(rreg));
+         panic("genSpill_X86: unimplemented regclass");
+   }
+}
+
+/* HACK */
+X86Instr* genReload_X86 ( HReg rreg, Int offset )
+{
+   assert(!hregIsVirtual(rreg));
+   switch (hregClass(rreg)) {
+      case HRcInt:
+        return
+	X86Instr_Alu32R ( Xalu_MOV, 
+		          X86RMI_Mem(X86AMode_IR(offset + 0x1000, 
+                                                 hregX86_EBP())),
+                          rreg );
+      default: 
+         ppHRegClass(stderr, hregClass(rreg));
+         panic("genReload_X86: unimplemented regclass");
+   }
+}
+
 
 int main ( void )
 {
@@ -37,20 +70,73 @@
    addToIRTypeEnv ( env, t1, Ity_I32 );
    addToIRTypeEnv ( env, t2, Ity_I32 );
 
+   IRStmt* s10 = IRStmt_Tmp(t1, IRExpr_Const(IRConst_U32(1001)));
+   IRStmt* s11 = IRStmt_Tmp(t2, IRExpr_Const(IRConst_U32(2002)));
+
    IRStmt* s1 = IRStmt_Put(8,4, IRExpr_Const(IRConst_U32(99)) );
    IRStmt* s2 = IRStmt_Put(7,4, IRExpr_Binop(Iop_Add32,
                                              IRExpr_Tmp(t1),
 					     IRExpr_Const(IRConst_U32(55))));
+   s10->link = s11;
+   s11->link = s1;
    s1->link = s2;
 
-   bb = mk_IRBB(env, s1, IRNext_UJump(IRConst_U32(-65565)));
+   bb = mk_IRBB(env, s10, IRNext_UJump(IRConst_U32(-65565)));
 
    printf("bb is ...\n");
    ppIRBB(stdout, bb);
    printf("\n");
 
-   vcode = iselBB(bb);
+   //   vcode = iselBB(bb);
    {
+     Int i;
+     HReg vr0 = mkHReg(0, HRcInt, True);
+     HReg vr1 = mkHReg(1, HRcInt, True);
+     HReg vr2 = mkHReg(2, HRcInt, True);
+     HReg vr3 = mkHReg(3, HRcInt, True);
+     HReg eax = hregX86_EAX();
+     HReg ebx = hregX86_EBX();
+     HReg ecx = hregX86_ECX();
+     HReg edx = hregX86_EDX();
+     HReg ebp = hregX86_EBP();
+     vcode = newHInstrArray();
+
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV, 
+				      X86RMI_Imm(0x10001), vr0));
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV, 
+				      X86RMI_Imm(0x10101), vr1));
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV, 
+				      X86RMI_Imm(0x10201), vr2));
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV, 
+				      X86RMI_Imm(0x10301), vr3));
+
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV,
+				      X86RMI_Imm(0x99999), eax));
+     addHInstr(vcode, X86Instr_Alu32R(Xalu_MOV,
+				      X86RMI_Imm(0x99999), edx));
+
+     addHInstr(vcode, X86Instr_Alu32M(Xalu_MOV,
+				      X86RI_Reg(vr0),
+				      X86AMode_IR(0x100, ebp)));
+     addHInstr(vcode, X86Instr_Alu32M(Xalu_MOV,
+				      X86RI_Reg(vr1),
+				      X86AMode_IR(0x101, ebp)));
+     addHInstr(vcode, X86Instr_Alu32M(Xalu_MOV,
+				      X86RI_Reg(vr2),
+				      X86AMode_IR(0x101, ebp)));
+     addHInstr(vcode, X86Instr_Alu32M(Xalu_MOV,
+				      X86RI_Reg(vr3),
+				      X86AMode_IR(0x101, ebp)));
+   printf("\nBefore\n");
+   for (i = 0; i < vcode->arr_used; i++) {
+     ppX86Instr(stdout, vcode->arr[i]);
+     printf("\n");
+   }
+   printf("\n");
+   }
+
+   {
+     Int i;
      HInstrArray* rcode;
      HReg rregs_to_use[4];
      rregs_to_use[0] = hregX86_EAX();
@@ -59,16 +145,22 @@
      rregs_to_use[3] = hregX86_EDX();
 
      rcode =
-     doRegisterAllocation(vcode, 3, /* vregs */
+     doRegisterAllocation(vcode, 4, /* vregs */
                           rregs_to_use, 4, /* rregs */
 			  NULL, /* ismove */
 			  getRegUsage_X86Instr,
 			  mapRegs_X86Instr,
-			  NULL, /* genspill */
-			  NULL /* genreload */
+			  genSpill_X86,
+			  genReload_X86
 			  );
 
-
+   printf("\nAfter\n");
+   for (i = 0; i < rcode->arr_used; i++) {
+     ppX86Instr(stdout, rcode->arr[i]);
+     printf("\n");
    }
+   printf("\n");
+   }
+
    return 0;
 }