--- asmcomp/amd64/emit.mlp.orig	2009-03-29 00:10:04.000000000 +0900
+++ asmcomp/amd64/emit.mlp	2009-09-17 19:11:53.000000000 +0900
@@ -576,33 +576,34 @@
             end
     | Lswitch jumptbl ->
         let lbl = new_label() in
-        if !pic_code || !Clflags.dlcode then begin
+        (*if !pic_code || !Clflags.dlcode then *) begin
           (* PR#4424: r11 is known to be clobbered by the Lswitch,
              meaning that no variable that is live across the Lswitch
              is assigned to r11.  However, the argument to Lswitch
              can still be assigned to r11, so we need to special-case 
              this situation. *)
           if i.arg.(0).loc = Reg 9 (* ie r11, cf amd64/proc.ml *) then begin
-            `	salq	$3, %r11\n`;
-            `	pushq	%r11\n`;
-            `	leaq	{emit_label lbl}(%rip), %r11\n`;
-            `	addq	0(%rsp), %r11\n`;
-            `	addq	$8, %rsp\n`;
-            `	jmp	*(%r11)\n`
+            `	pushq	%rax\n`;
+            `	leaq	{emit_label lbl}(%rip), %rax\n`;
+            `	movq	(%rax, %r11, 8), %r11\n`;
+            `	addq	%rax, %r11\n`;
+            `	popq	%rax\n`;
+            `	jmp	*%r11\n`
           end else begin
             `	leaq	{emit_label lbl}(%rip), %r11\n`;
-            `	jmp	*(%r11, {emit_reg i.arg.(0)}, 8)\n`
+            `	addq	(%r11, {emit_reg i.arg.(0)}, 8), %r11\n`;
+            `	jmp	*%r11\n`
           end
-        end else begin
+        end (* else begin
           `	jmp	*{emit_label lbl}(, {emit_reg i.arg.(0)}, 8)\n`
-        end;
+        end *) ;
         if macosx
         then `	.const\n`
         else `	.section .rodata\n`;
         emit_align 8;
         `{emit_label lbl}:`;
         for i = 0 to Array.length jumptbl - 1 do
-          `	.quad	{emit_label jumptbl.(i)}\n`
+          `	.quad	{emit_label jumptbl.(i)}-{emit_label lbl}\n`
         done;
         `	.text\n`
     | Lsetuptrap lbl ->