Ticket #551: pointerref.patch

src/vtable.tbl

@@ -63 +63 @@
 void* get_pointer_keyed(PMC* key)
 void* get_pointer_keyed_int(INTVAL key)
 void* get_pointer_keyed_str(STRING* key)
+void** get_pointerref()
 
 [STORE] :write
 void set_integer_native(INTVAL value)

src/pmc/pointer.pmc

@@ -121 +121 @@
 
 /*
 
+=item C<void **get_pointerref()>
+
+Returns the pointer address.
+
+=cut
+
+*/
+
+    VTABLE void **get_pointerref() {
+        return &PARROT_POINTER(SELF)->pointer;
+    }
+
+/*
+
 =item C<INTVAL get_integer()>
 
 Returns the pointer value as an integer.

src/jit/i386/jit_defs.c

@@ -2268 +2268 @@
             case 'V':
                 emitm_call_cfunc(pc, get_nci_P);
                 emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, temp_calls_offset + 4);
-                /* Call the get_pointer VTABLE on the Pointer PMC to get the returned pointer */
+                /* Call the get_pointer VTABLE on the Pointer PMC to get the pointer address */
                 emitm_movl_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1, offsetof(PMC, vtable));
-                emitm_movl_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1, offsetof(VTABLE, get_pointer));
+                emitm_movl_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1, offsetof(VTABLE, get_pointerref));
                 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);

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 = VTABLE_get_pointerref(interp, t_$temp_num);";
+#        push @{$extra_postamble_ref}, "VTABLE_set_pointer(interp, t_$temp_num, v_$temp_num);";
+        return "v_$temp_num";
     };
     /[ilIscfdNS]/ && do {
         my $ret_type = $sig_table{$_}{return_type};

lib/Parrot/Vtable.pm

@@ -398 +398 @@
     my %typemap = (
         'STRING*'   => 'Parrot_String',
         'void*'     => 'void*',
+        'void**'    => 'void**',
         'INTVAL'    => 'Parrot_Int',
         'PMC*'      => 'Parrot_PMC',
         'FLOATVAL'  => 'Parrot_Float',

lib/Parrot/Pmc2c/Parser.pm

@@ -213 +213 @@
 
         my $returntype = '';
 
-        if ($methodname =~ /(.*\s+\*?)(\w+)/) {
+        if ($methodname =~ /(.*\s+\*{0,2})(\w+)/) {
             ($returntype, $methodname) = ($1, $2);
         }
 

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