x86_64: adapt MiG generated stubs to use mach_port_name_inlined_t for inlined port rights.

For i686, we just change the code to use mach_port_name_inlined_t when
defining the types. This is a no-op.

For x86_64, there's a few things that are different:
- In the server code, the server handler can get inlined ports and the
  array will be resized and cast as an array of mach_port_name_t. Output
  parameters have a similar treatment where the inlined array in the
  output is used as an array of mach_port_name_t but resized to look like
  a mach_port_name_inlined_t.
- In the user side, we follow the same approach. Input ports as arrays
  of mach_port_name_t are expanded into an array of mach_port_name_inlined_t.
  Output ports are then converted back into an array of
  mach_port_name_inlined_t so that they fit into the expected message
  format.

Essentially, regardless of whether port rights are inline or out of
line, user interfaces and server stubs always receive an array of port
rights, not mach_port_name_inlined_t. However, inlined port rights will
be exchanged using mach_port_name_inlined_t.
Message-ID: <20231124213041.952886-4-flaviocruz@gmail.com>

1 files changed, 22 insertions, 6 deletions

diff --git a/utils.c b/utils.c
index ec0f2d1..0d69cb2 100644
--- a/utils.c
+++ b/utils.c
@@ -317,6 +317,9 @@ WriteFieldDeclPrim(FILE *file, const argument_t *arg,
     if (it->itInLine && it->itVarArray)
     {
 	ipc_type_t *btype = it->itElement;
+	identifier_t original_type_name = (*tfunc)(btype);
+	identifier_t inlined_type_name = btype->itUserlandPort ?
+	    "mach_port_name_inlined_t" : original_type_name;
 
 	/*
 	 *	Build our own declaration for a varying array:
@@ -325,19 +328,27 @@ WriteFieldDeclPrim(FILE *file, const argument_t *arg,
 	 */
 	fprintf(file, "\t\tunion {\n");
 	fprintf(file, "\t\t\t%s %s[%d];\n",
-			(*tfunc)(btype),
+			inlined_type_name,
 			arg->argMsgField,
 			it->itNumber/btype->itNumber);
 	fprintf(file, "\t\t\t%s%s *%s%s;\n",
 			tfunc == FetchUserType && UserVarConst(arg)
 				? "const " : "",
-			(*tfunc)(btype),
+			original_type_name,
 			arg->argMsgField,
 			OOLPostfix);
 	fprintf(file, "\t\t};");
     }
     else
-	fprintf(file, "\t\t%s %s;", (*tfunc)(it), arg->argMsgField);
+    {
+        identifier_t original_type_name = (*tfunc)(it);
+        identifier_t final_type_name = it->itUserlandPort && it->itInLine ?
+	    "mach_port_name_inlined_t" : original_type_name;
+
+        fprintf(file, "\t\t%s %s;",
+		final_type_name,
+                arg->argMsgField);
+    }
 
     if (it->itPadSize != 0)
 	fprintf(file, "\n\t\tchar %s[%d];", arg->argPadName, it->itPadSize);
@@ -366,7 +377,11 @@ WriteStaticLongDecl(FILE *file, const ipc_type_t *it,
 	 * so we fill mach_msg_type_long_t just like mach_msg_type_t.
 	 */
 	fprintf(file, "\t\t\t.msgt_name =\t\t(unsigned char) %s,\n", msgt_name);
-	fprintf(file, "\t\t\t.msgt_size =\t\t%d,\n", it->itSize);
+	/* In case we are passing out of line ports, we always send as a contiguous array of port names
+	 * rather than mach_port_name_inlined_t. */
+	const u_int true_size = (it->itUserlandPort && !it->itInLine && it->itNumber == 0) ?
+	    port_name_size_in_bits : it->itSize;
+	fprintf(file, "\t\t\t.msgt_size =\t\t%d,\n", true_size);
 	fprintf(file, "\t\t\t.msgt_number =\t\t%d,\n", it->itNumber);
     } else {
 	fprintf(file, "\t\t\t.msgt_name =\t\t0,\n");
@@ -407,10 +422,11 @@ WriteStaticShortDecl(FILE *file, const ipc_type_t *it,
     fprintf(file, "\t};\n");
     if (it->itInLine && !it->itVarArray) {
         identifier_t type = is_server ? FetchServerType(it) : FetchUserType(it);
+        identifier_t actual_type = it->itUserlandPort ? "mach_port_name_inlined_t" : type;
         const u_int size_bytes = it->itSize >> 3;
         fprintf(file, "\t_Static_assert(sizeof(%s) == %d * %d, \"expected %s to be size %d * %d\");\n",
-                      type, size_bytes, it->itNumber,
-                      type, size_bytes, it->itNumber);
+                      actual_type, size_bytes, it->itNumber,
+                      actual_type, size_bytes, it->itNumber);
     }
 }