Ticket #551: nci_V_fix.patch

src/nci_test.c

@@ -104 +104 @@
 PARROT_EXPORT void   nci_vpii(Outer *, int, int);
 PARROT_EXPORT void   nci_vv(void);
 PARROT_EXPORT void   nci_vVi(Opaque**, int);
-PARROT_EXPORT void   nci_vp(Opaque*);
+PARROT_EXPORT void   nci_vp(Opaque**);
 PARROT_EXPORT char * nci_ttt(char *, char *);
 PARROT_EXPORT void   nci_vfff(float, float, float);
 PARROT_EXPORT void   nci_vV(const char **);
@@ -1087 +1087 @@
 /*
 
 =item C<PARROT_EXPORT int
-nci_vp(Opaque*)>
+nci_vp(Opaque**)>
 
 Test that a previously generated opaque struct gets passed back
 to an NCI function correctly.
@@ -1097 +1097 @@
 */
 
 PARROT_EXPORT void
-nci_vp(Opaque *inOpaque)
+nci_vp(Opaque **inOpaque)
 {
-    if (inOpaque)
-        printf("got %d\n", inOpaque->x);
+    if (*inOpaque)
+        printf("got %d\n", (*inOpaque)->x);
     else
         printf("got null");
 }

src/pmc/pointer.pmc

@@ -23 +23 @@
 #include "parrot/parrot.h"
 
 pmclass Pointer need_ext {
-    ATTR void * mark_function;
-    ATTR void * pointer;
+    ATTR void  * mark_function;
+    ATTR void ** pointer;
 
 /*
 
@@ -69 +69 @@
     VTABLE void mark() {
         void (*mark_function)(Interp *, void *) =
             (void (*)(Interp *, void *))D2FPTR(PARROT_POINTER(SELF)->mark_function);
-        void * data = PARROT_POINTER(SELF)->pointer;
+        void * data = *PARROT_POINTER(SELF)->pointer;
         if (data && mark_function)
             (*mark_function)(INTERP, data);
     }
@@ -102 +102 @@
 */
 
     VTABLE void set_pointer(void *ptr) {
-        PARROT_POINTER(SELF)->pointer = ptr;
+        *PARROT_POINTER(SELF)->pointer = ptr;
     }
 
 /*
@@ -116 +116 @@
 */
 
     VTABLE void *get_pointer() {
-        return PARROT_POINTER(SELF)->pointer;
+        return &(PARROT_POINTER(SELF)->pointer);
     }
 
 /*
@@ -130 +130 @@
 */
 
     VTABLE INTVAL get_integer() {
-        return (INTVAL)(PARROT_POINTER(SELF)->pointer);
+        return (INTVAL)&(PARROT_POINTER(SELF)->pointer);
     }
 
 /*
@@ -144 +144 @@
 */
 
     VTABLE FLOATVAL get_number() {
-        return (FLOATVAL)(INTVAL)(PARROT_POINTER(SELF)->pointer);
+        return (FLOATVAL)(INTVAL)&(PARROT_POINTER(SELF)->pointer);
     }
 
 /*
@@ -158 +158 @@
 */
 
     VTABLE STRING *get_repr() {
-        return Parrot_sprintf_c(INTERP, "Pointer = 0x%p", PARROT_POINTER(SELF)->pointer);
+        return Parrot_sprintf_c(INTERP, "Pointer = 0x%p", &PARROT_POINTER(SELF)->pointer);
     }
 
 
@@ -166 +166 @@
 
 =item C<STRING *get_string()>
 
-Returns the pointer value as a Parrot string.
+Returns the pointer value as a Parrot C<STRING*>.
 
 =cut
 
@@ -187 +187 @@
 */
 
     VTABLE INTVAL get_bool() {
-        return (INTVAL)(PMC_data(SELF) != NULL);
+        return (INTVAL)(*PARROT_POINTER(SELF)->pointer != NULL);
     }
 
 /*

src/jit/i386/jit_defs.c

@@ -2273 +2273 @@
                 emitm_movl_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1, offsetof(VTABLE, get_pointer));
                 emitm_callr(pc, emit_EAX);
                 emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
+                /* reset ESP(4) */
+                emitm_lea_m_r(interp, pc, emit_EAX, emit_EBP, 0, 1, st_offset);
+                emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, temp_calls_offset + 4);
                 break;
             case 'b':   /* buffer (void*) pass PObj_bufstart(SReg) */
                 emitm_call_cfunc(pc, get_nci_S);

t/pmc/nci.t

@@ -2647 +2647 @@
 3
 OUTPUT
 
-{
-    local $TODO = 0;
-    if ($PConfig{jitcapable}){
-        $TODO = "TT #551 - jitted NCI sig with V is broken";
-    }
 pir_output_is( << 'CODE', << 'OUTPUT', "nci_vVi - void** out parameter" );
 .sub test :main
     .local string library_name
@@ -2674 +2669 @@
 CODE
 got 10
 OUTPUT
-}
 
 pir_output_is( << 'CODE', << 'OUTPUT', "nci_ttt - t_tt parameter" );
 .sub test :main
@@ -2712 +2706 @@
 1
 OUTPUT
 
-{
-    local $TODO = 0;
-    if ($PConfig{jitcapable}){
-        $TODO = "TT #551 - jitted NCI sig with V is broken";
-    }
 pir_output_is( << 'CODE', << 'OUTPUT', "nci_vV - char** out parameter" );
 .sub test :main
     .local string library_name
@@ -2764 +2753 @@
 It is a beautiful day!
 Go suck a lemon.
 OUTPUT
-}
 
 # Local Variables:
 #   mode: cperl

tools/build/nativecall.pl

@@ -353 +353 @@
     };
     /V/ && do {
         push @{$temps_ref},          "PMC *t_$temp_num;";
-        push @{$temps_ref},          "void *v_$temp_num;";
+        push @{$temps_ref},          "void **v_$temp_num;";
         push @{$extra_preamble_ref}, "t_$temp_num = GET_NCI_P($reg_num);";
-        push @{$extra_preamble_ref}, "v_$temp_num = VTABLE_get_pointer(interp, t_$temp_num);";
-        push @{$extra_postamble_ref}, "VTABLE_set_pointer(interp, t_$temp_num, v_$temp_num);";
-        return "&v_$temp_num";
+        push @{$extra_preamble_ref}, "v_$temp_num = (void **) VTABLE_get_pointer(interp, t_$temp_num);";
+        return "v_$temp_num";
     };
     /[ilIscfdNS]/ && do {
         my $ret_type = $sig_table{$_}{return_type};