[svn:parrot] r44780 - in branches/pcc_hackathon_6Mar10: src/nci tools/dev

chromatic at svn.parrot.org chromatic at svn.parrot.org
Mon Mar 8 23:11:27 UTC 2010


Author: chromatic
Date: Mon Mar  8 23:11:26 2010
New Revision: 44780
URL: https://trac.parrot.org/parrot/changeset/44780

Log:
[NCI] Updated NCI to use Parrot_pcc_build_call_from_c_args() instead of
Parrot_pcc_fill_returns_from_c_args().

Modified:
   branches/pcc_hackathon_6Mar10/src/nci/core_thunks.c
   branches/pcc_hackathon_6Mar10/src/nci/extra_thunks.c
   branches/pcc_hackathon_6Mar10/tools/dev/nci_thunk_gen.pir

Modified: branches/pcc_hackathon_6Mar10/src/nci/core_thunks.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/nci/core_thunks.c	Mon Mar  8 23:09:26 2010	(r44779)
+++ branches/pcc_hackathon_6Mar10/src/nci/core_thunks.c	Mon Mar  8 23:11:26 2010	(r44780)
@@ -56,7 +56,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (double)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 
 
@@ -78,7 +78,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -100,7 +100,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -121,7 +121,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -142,7 +142,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 
 
@@ -163,7 +163,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -230,7 +230,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -252,7 +252,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -274,7 +274,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -297,7 +297,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -531,7 +531,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -555,7 +555,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -579,7 +579,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -603,7 +603,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -626,7 +626,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -648,7 +648,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -670,7 +670,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -691,7 +691,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -732,7 +732,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -755,7 +755,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -780,7 +780,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -804,7 +804,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -828,7 +828,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -876,7 +876,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 
 
@@ -921,7 +921,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -945,7 +945,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -970,7 +970,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -993,7 +993,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 }
@@ -1035,7 +1035,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 }

Modified: branches/pcc_hackathon_6Mar10/src/nci/extra_thunks.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/nci/extra_thunks.c	Mon Mar  8 23:09:26 2010	(r44779)
+++ branches/pcc_hackathon_6Mar10/src/nci/extra_thunks.c	Mon Mar  8 23:11:26 2010	(r44780)
@@ -75,7 +75,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -97,7 +97,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2, PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -120,7 +120,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -143,7 +143,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -165,7 +165,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -185,7 +185,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 }
@@ -210,7 +210,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 }
 static void
@@ -234,7 +234,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -256,7 +256,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(interp);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 }
 static void
@@ -279,7 +279,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(interp, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -303,7 +303,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0));
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 }
 static void
@@ -325,7 +325,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -448,7 +448,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -473,7 +473,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -498,7 +498,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(&v_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_pointer(interp, t_0, v_0);
 
 
@@ -840,7 +840,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -861,7 +861,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 }
@@ -882,7 +882,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -903,7 +903,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 }
@@ -923,7 +923,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 
 }
@@ -943,7 +943,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -964,7 +964,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -989,7 +989,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1066,7 +1066,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3, t_4, t_5);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1095,7 +1095,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3, t_4, t_5, t_6);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1122,7 +1122,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1147,7 +1147,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1173,7 +1173,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -1196,7 +1196,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), &i_2, PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -1220,7 +1220,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), &i_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -1243,7 +1243,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1267,7 +1267,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -1292,7 +1292,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1319,7 +1319,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -1345,7 +1345,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -1372,7 +1372,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -1400,7 +1400,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -1427,7 +1427,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -1456,7 +1456,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -1521,7 +1521,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0, t_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -1542,7 +1542,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -1588,7 +1588,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 
 
@@ -1631,7 +1631,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (INTVAL)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -1651,7 +1651,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (FLOATVAL)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 
 }
@@ -1694,7 +1694,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1738,7 +1738,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1761,7 +1761,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (PMC *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "P", return_data);
     
 
 
@@ -1785,7 +1785,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(interp, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 
 
@@ -1805,7 +1805,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -1826,7 +1826,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, &i_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 
@@ -1849,7 +1849,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, Buffer_bufstart(t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1873,7 +1873,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(t_0, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -1897,7 +1897,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1920,7 +1920,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -1941,7 +1941,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (STRING *)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "S", return_data);
     
 }
 static void
@@ -1960,7 +1960,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -1979,7 +1979,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -2004,7 +2004,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -2029,7 +2029,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 }
 static void
@@ -2053,7 +2053,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4, t_5);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2080,7 +2080,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2114,7 +2114,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2141,7 +2141,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -2163,7 +2163,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2185,7 +2185,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -2206,7 +2206,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -2224,7 +2224,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -2249,7 +2249,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -2276,7 +2276,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2299,7 +2299,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2326,7 +2326,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -2348,7 +2348,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2372,7 +2372,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2425,7 +2425,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2460,7 +2460,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2492,7 +2492,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 
@@ -2522,7 +2522,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4, t_5, PMC_IS_NULL((PMC*)t_6) ? (void *)NULL : VTABLE_get_pointer(interp, t_6), t_7);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2553,7 +2553,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, Buffer_bufstart(t_4), t_5);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 
@@ -2589,7 +2589,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2626,7 +2626,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -2660,7 +2660,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -2694,7 +2694,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2726,7 +2726,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -2755,7 +2755,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -2779,7 +2779,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -2830,7 +2830,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2853,7 +2853,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -2882,7 +2882,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2910,7 +2910,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 }
@@ -2937,7 +2937,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -2961,7 +2961,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, &i_2, &i_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -2981,7 +2981,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -3001,7 +3001,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -3019,7 +3019,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (double)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 }
 static void
@@ -3038,7 +3038,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (double)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 }
 static void
@@ -3055,7 +3055,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (float)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 }
 static void
@@ -3075,7 +3075,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (float)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 
 }
@@ -3096,7 +3096,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (float)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "N", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "N", return_data);
     
 
 }
@@ -3116,7 +3116,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(Buffer_bufstart(t_0));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -3135,7 +3135,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -3154,7 +3154,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -3174,7 +3174,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -3196,7 +3196,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, &i_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3220,7 +3220,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, &i_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3245,7 +3245,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3272,7 +3272,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, t_3, t_4, PMC_IS_NULL((PMC*)t_5) ? (void *)NULL : VTABLE_get_pointer(interp, t_5));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3298,7 +3298,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3322,7 +3322,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3346,7 +3346,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3369,7 +3369,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -3393,7 +3393,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -3418,7 +3418,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3442,7 +3442,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -3463,7 +3463,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -3483,7 +3483,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -3504,7 +3504,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -3526,7 +3526,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3549,7 +3549,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, &i_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3573,7 +3573,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, &i_2, &i_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3601,7 +3601,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, &i_2, &i_3, &i_4, &i_5, &i_6);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3627,7 +3627,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -3650,7 +3650,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, &i_2, PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -3674,7 +3674,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 
@@ -3696,7 +3696,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), Buffer_bufstart(t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -3718,7 +3718,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3742,7 +3742,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, &i_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3768,7 +3768,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, &i_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3794,7 +3794,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3822,7 +3822,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4, t_5, t_6);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3853,7 +3853,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4, t_5, PMC_IS_NULL((PMC*)t_6) ? (void *)NULL : VTABLE_get_pointer(interp, t_6));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3881,7 +3881,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3907,7 +3907,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3933,7 +3933,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3959,7 +3959,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -3986,7 +3986,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, PMC_IS_NULL((PMC*)t_4) ? (void *)NULL : VTABLE_get_pointer(interp, t_4));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4011,7 +4011,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4034,7 +4034,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4063,7 +4063,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4, t_5, t_6, t_7, t_8);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4092,7 +4092,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4116,7 +4116,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4139,7 +4139,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -4161,7 +4161,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4191,7 +4191,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, t_4, t_5, t_6, t_7, t_8, t_9);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4222,7 +4222,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4246,7 +4246,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4269,7 +4269,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -4293,7 +4293,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -4315,7 +4315,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -4336,7 +4336,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, &i_1, &i_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -4360,7 +4360,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, &i_1, &i_2, &i_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -4383,7 +4383,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -4405,7 +4405,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4429,7 +4429,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4451,7 +4451,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 }
 static void
@@ -4471,7 +4471,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 }
@@ -4491,7 +4491,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(&i_0);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_integer_native(interp, t_0, i_0);
 }
 static void
@@ -4511,7 +4511,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(&i_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_integer_native(interp, t_0, i_0);
 
 }
@@ -4533,7 +4533,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(&i_0, &i_1, PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_integer_native(interp, t_0, i_0);
 VTABLE_set_integer_native(interp, t_1, i_1);
 
@@ -4555,7 +4555,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -4576,7 +4576,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(t_0, &i_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -4597,7 +4597,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -4619,7 +4619,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -4643,7 +4643,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), &i_1, &i_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -4667,7 +4667,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (long)(*fn_pointer)(&i_0, &i_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_integer_native(interp, t_0, i_0);
 VTABLE_set_integer_native(interp, t_1, i_1);
 
@@ -4691,7 +4691,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 }
 static void
@@ -4715,7 +4715,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 }
 static void
@@ -4739,7 +4739,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 }
 static void
@@ -4763,7 +4763,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -4788,7 +4788,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 }
 static void
@@ -4813,7 +4813,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -4841,7 +4841,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -4873,7 +4873,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -4909,7 +4909,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -4942,7 +4942,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -4972,7 +4972,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -5000,7 +5000,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 }
 static void
@@ -5026,7 +5026,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 
@@ -5058,7 +5058,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 if (t_1) Parrot_str_free_cstring(t_1);
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -5081,7 +5081,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (short)(*fn_pointer)();
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 }
 static void
@@ -5100,7 +5100,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)();
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 }
 static void
@@ -5121,7 +5121,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 }
 static void
@@ -5143,7 +5143,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0, t_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 
 }
@@ -5166,7 +5166,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 
 }
@@ -5190,7 +5190,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 
 
@@ -5213,7 +5213,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 }
 static void
@@ -5236,7 +5236,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0, t_1, &i_2);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 
 VTABLE_set_integer_native(interp, t_2, i_2);
@@ -5260,7 +5260,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(t_0, &i_1);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -5281,7 +5281,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -5302,7 +5302,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (short)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -5323,7 +5323,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char)(*fn_pointer)(t_0, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -5345,7 +5345,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5367,7 +5367,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, &i_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -5389,7 +5389,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(Buffer_bufstart(t_0));
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     
 }
 static void
@@ -5410,7 +5410,7 @@
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (char *)(*fn_pointer)(&t_0);
     final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "S", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "S", final_destination);
     if (t_0) Parrot_str_free_cstring(t_0);
 }
 static void
@@ -5475,7 +5475,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 }
@@ -5496,7 +5496,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(&i_0, &i_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     VTABLE_set_integer_native(interp, t_0, i_0);
 VTABLE_set_integer_native(interp, t_1, i_1);
 }
@@ -5559,7 +5559,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -5580,7 +5580,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5602,7 +5602,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -5623,7 +5623,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 }
@@ -5643,7 +5643,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(interp, t_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 }
@@ -5693,7 +5693,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -5729,7 +5729,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, "P", final_destination);
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, "P", final_destination);
     
 
 
@@ -5759,7 +5759,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5785,7 +5785,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5813,7 +5813,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, t_4, t_5);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5843,7 +5843,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, t_4, t_5, t_6);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5875,7 +5875,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2, t_3, t_4, t_5, t_6, t_7);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5903,7 +5903,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);
@@ -5927,7 +5927,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), t_3);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5953,7 +5953,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -5982,7 +5982,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), t_3, t_4, t_5, t_6);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -6016,7 +6016,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), PMC_IS_NULL((PMC*)t_1) ? (void *)NULL : VTABLE_get_pointer(interp, t_1), PMC_IS_NULL((PMC*)t_2) ? (void *)NULL : VTABLE_get_pointer(interp, t_2), PMC_IS_NULL((PMC*)t_3) ? (void *)NULL : VTABLE_get_pointer(interp, t_3), t_4, t_5, t_6, t_7, t_8, t_9);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -6110,7 +6110,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(t_0, &v_1);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     if (t_0) Parrot_str_free_cstring(t_0);
 VTABLE_set_pointer(interp, t_1, v_1);
 }
@@ -6134,7 +6134,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, &v_3, PMC_IS_NULL((PMC*)t_4) ? (void *)NULL : VTABLE_get_pointer(interp, t_4));
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 if (t_1) Parrot_str_free_cstring(t_1);
 
@@ -6159,7 +6159,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 
@@ -6184,7 +6184,7 @@
     GETATTR_NCI_orig_func(interp, self, orig_func);
     fn_pointer = (func_t)D2FPTR(orig_func);
     return_data =  (int)(*fn_pointer)(PMC_IS_NULL((PMC*)t_0) ? (void *)NULL : VTABLE_get_pointer(interp, t_0), t_1, t_2, t_3, t_4);
-    Parrot_pcc_fill_returns_from_c_args(interp, call_object, "I", return_data);
+    Parrot_pcc_build_call_from_c_args(interp, call_object, "I", return_data);
     
 
 if (t_2) Parrot_str_free_cstring(t_2);

Modified: branches/pcc_hackathon_6Mar10/tools/dev/nci_thunk_gen.pir
==============================================================================
--- branches/pcc_hackathon_6Mar10/tools/dev/nci_thunk_gen.pir	Mon Mar  8 23:09:26 2010	(r44779)
+++ branches/pcc_hackathon_6Mar10/tools/dev/nci_thunk_gen.pir	Mon Mar  8 23:11:26 2010	(r44780)
@@ -835,7 +835,7 @@
                              final_destination = Parrot_pmc_new(interp, enum_class_UnManagedStruct);
                              VTABLE_set_pointer(interp, final_destination, return_data);
                           }
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, \"P\", final_destination);" },
+                          Parrot_pcc_build_call_from_c_args(interp, call_object, \"P\", final_destination);" },
     "i": { "as_proto": "int", "sig_char": "I",
            "return_type": "INTVAL" },
     "l": { "as_proto": "long",   "sig_char": "I", "return_type": "INTVAL" },
@@ -846,7 +846,7 @@
     "t": { "as_proto": "char *",
            "final_dest": "STRING *final_destination;",
            "ret_assign": "final_destination = Parrot_str_new(interp, return_data, 0);
-                          Parrot_pcc_fill_returns_from_c_args(interp, call_object, \"S\", final_destination);",
+           Parrot_pcc_build_call_from_c_args(interp, call_object, \"S\", final_destination);",
            "sig_char": "S",
            "temp_tmpl": "char *t_%i; STRING *ts_%i",
            "fill_params_tmpl": ", &ts_%i",
@@ -884,7 +884,7 @@
     "2": { "as_proto": "short *",
            "sig_char": "P",
            "return_type": "short",
-           "ret_assign": "Parrot_pcc_fill_returns_from_c_args(interp, call_object, \"I\", return_data);",
+           "ret_assign": "Parrot_pcc_build_call_from_c_args(interp, call_object, \"I\", return_data);",
            "temp_tmpl": "PMC *t_%i; short i_%i",
            "preamble_tmpl": "i_%i = VTABLE_get_integer(interp, t_%i);",
            "call_param_tmpl": "&i_%i",
@@ -892,7 +892,7 @@
     "3": { "as_proto": "int *",
            "sig_char": "P",
            "return_type": "int",
-           "ret_assign": "Parrot_pcc_fill_returns_from_c_args(interp, call_object, \"I\", return_data);",
+           "ret_assign": "Parrot_pcc_build_call_from_c_args(interp, call_object, \"I\", return_data);",
            "temp_tmpl": "PMC *t_%i; int i_%i",
            "preamble_tmpl": "i_%i = VTABLE_get_integer(interp, t_%i);",
            "call_param_tmpl": "&i_%i",
@@ -900,7 +900,7 @@
     "4": { "as_proto": "long *",
            "sig_char": "P",
            "return_type": "long",
-           "ret_assign": "Parrot_pcc_fill_returns_from_c_args(interp, call_object, \"I\", return_data);",
+           "ret_assign": "Parrot_pcc_build_call_from_c_args(interp, call_object, \"I\", return_data);",
            "temp_tmpl": "PMC *t_%i; long i_%i",
            "preamble_tmpl": "i_%i = VTABLE_get_integer(interp, t_%i);",
            "call_param_tmpl": "&i_%i",
@@ -960,7 +960,7 @@
     $I1 = !$I1
     $I0 = $I0 || $I1 # not (not exists v[ret_assign] and exists v[sig_char])
     if $I0 goto has_ret_assign
-        $S0 = 'Parrot_pcc_fill_returns_from_c_args(interp, call_object, "'
+        $S0 = 'Parrot_pcc_build_call_from_c_args(interp, call_object, "'
         $S1 = v['sig_char']
         $S0 = concat $S0, $S1
         $S0 = concat $S0, '", return_data);'


More information about the parrot-commits mailing list