Index: tools/amd64/gencontext.c
===================================================================
--- tools/amd64/gencontext.c	(revision 9d5e23cc7bc9f1f8f9799b82cd567c045c657dd3)
+++ tools/amd64/gencontext.c	(revision 47c83bcb3e0f2196c57beafc037ebc86b7a1b0de)
@@ -17,4 +17,7 @@
 	struct context *pctx = &ctx;
 
+	struct interrupt_context ictx;
+	struct interrupt_context *ipctx = &ictx;
+
 	f = fopen(FILENAME,"w");
 	if (!f) {
@@ -34,4 +37,27 @@
 	fprintf(f,"#define OFFSET_R15 0x%x\n",((int)&pctx->r15) - (int )pctx);
 	fprintf(f,"#define OFFSET_IPL 0x%x\n",((int)&pctx->ipl) - (int )pctx);
+
+	fprintf(f, "\n");
+
+#define ifpr(big,nm) fprintf(f, "#define IOFFSET_" #big " 0x%x\n", ((int)&ipctx->nm) - (int) ipctx)
+	
+	ifpr(RAX, rax);
+	ifpr(RBX, rbx);
+	ifpr(RCX, rcx);
+	ifpr(RDX, rdx);
+	ifpr(RSI, rsi);
+	ifpr(RDI, rdi);
+	ifpr(R8, r8);
+	ifpr(R9, r9);
+	ifpr(R10, r10);
+	ifpr(R11, r11);
+	ifpr(R12, r12);
+	ifpr(R13, r13);
+	ifpr(R14, r14);
+	ifpr(R15, r15);
+	ifpr(RBP, rbp);
+
+	fprintf(f, "#define IREGISTER_SPACE %d\n", sizeof(ictx));
+
 	fclose(f);