X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/167524b5890cdbf4a832b1766a328f6d8a1f8f04..3aab0efa423fe20713c8cc02e8aabdf7fe84056b:/src/method-impl.lisp?ds=inline

diff --git a/src/method-impl.lisp b/src/method-impl.lisp
index 8501a02..db1e8d6 100644
--- a/src/method-impl.lisp
+++ b/src/method-impl.lisp
@@ -337,7 +337,7 @@
 		(sod-class-nickname message-class)
 		(sod-message-name message)
 		(sod-class-nickname chain-head))
-	0)))
+	*null-pointer*)))
 
 (defmethod method-entry-slot-name ((entry method-entry))
   (let* ((method (method-entry-effective-method entry))
@@ -420,10 +420,9 @@
 	 ;; Effective method function details.
 	 (emf-name (effective-method-function-name method))
 	 (ilayout-type (c-type (* (struct (ilayout-struct-tag class)))))
-	 (emf-arg-tail (sod-message-no-varargs-tail message))
 	 (emf-type (c-type (fun (lisp return-type)
 				("sod__obj" (lisp ilayout-type))
-				. emf-arg-tail))))
+				. entry-args))))
 
     (flet ((setup-entry (tail)
 	     (let ((head (sod-class-chain-head tail)))
@@ -438,7 +437,15 @@
 		    (type (c-type (fun (lisp return-type)
 				       ("me" (* (class tail)))
 				       . entry-args))))
-	       (codegen-pop-function codegen name type)
+	       (codegen-pop-function codegen name type
+		"~@(~@[~A ~]entry~) function ~:_~
+		 for method `~A.~A' ~:_~
+		 via chain headed by `~A' ~:_~
+		 defined on `~A'."
+		(if parm-n "Indirect argument-tail" nil)
+		(sod-class-nickname message-class)
+		(sod-message-name message)
+		head class)
 
 	       ;; If this is a varargs method then we've made the
 	       ;; `:valist' role.  Also make the `nil' role.
@@ -458,7 +465,15 @@
 				    (deliver-expr codegen target call)
 				    (deliver-call codegen :void "va_end"
 						  *sod-ap*)))
-		   (codegen-pop-function codegen main main-type))))))
+		   (codegen-pop-function codegen main main-type
+		    "Variable-length argument list ~:_~
+		     entry function ~:_~
+		     for method `~A.~A' ~:_~
+		     via chain headed by `~A' ~:_~
+		     defined on `~A'."
+		(sod-class-nickname message-class)
+		(sod-message-name message)
+		head class))))))
 
       ;; Generate the method body.  We'll work out what to do with it later.
       (codegen-push codegen)
@@ -492,10 +507,15 @@
 		 ;; function and call it a lot.
 		 (codegen-build-function codegen emf-name emf-type vars
 		  (nconc insts (and result
-				    (list (make-return-inst result)))))
+				    (list (make-return-inst result))))
+		  "Effective method function ~:_for `~A.~A' ~:_~
+		   defined on `~A'."
+		  (sod-class-nickname message-class)
+		  (sod-message-name message)
+		  (effective-method-class method))
 
 		 (let ((call (apply #'make-call-inst emf-name "sod__obj"
-				    (mapcar #'argument-name emf-arg-tail))))
+				    (mapcar #'argument-name entry-args))))
 		   (dolist (tail chain-tails)
 		     (setup-entry tail)
 		     (deliver-expr codegen entry-target call)