Index: /branches/x8664-call/ccl/compiler/X86/x86-asm.lisp
===================================================================
--- /branches/x8664-call/ccl/compiler/X86/x86-asm.lisp	(revision 6290)
+++ /branches/x8664-call/ccl/compiler/X86/x86-asm.lisp	(revision 6291)
@@ -1072,7 +1072,14 @@
 
    ;; call
-   (def-x8664-opcode callq ((:label :insert-label))
+   ;; Probably need to align CALL instructions within the containing function,
+   ;; so that return addresses are tagged appropriately.
+   (def-x8664-opcode call ((:label :insert-label))
      #xe8 nil nil)
 
+   (def-x8664-opcode call ((:reg64 :insert-modrm-rm))
+     #xff #o320 #x0)
+
+   (def-x8664-opcode call ((:anymem :insert-memory))
+     #xff #o020 #x0)
 
    ;; cbtw
@@ -4555,4 +4562,5 @@
      (register-entry "fs")
      (register-entry "gs")
+     (register-entry "rip")
      )))
 
