[svn:parrot] r44704 - in branches/pcc_hackathon_6Mar10: include/parrot src/call

allison at svn.parrot.org allison at svn.parrot.org
Sat Mar 6 14:02:40 UTC 2010


Author: allison
Date: Sat Mar  6 14:02:38 2010
New Revision: 44704
URL: https://trac.parrot.org/parrot/changeset/44704

Log:
[pcc] Remove deprecated and unused function for old-style return
handling from an op.

Modified:
   branches/pcc_hackathon_6Mar10/include/parrot/call.h
   branches/pcc_hackathon_6Mar10/src/call/args.c

Modified: branches/pcc_hackathon_6Mar10/include/parrot/call.h
==============================================================================
--- branches/pcc_hackathon_6Mar10/include/parrot/call.h	Sat Mar  6 13:54:56 2010	(r44703)
+++ branches/pcc_hackathon_6Mar10/include/parrot/call.h	Sat Mar  6 14:02:38 2010	(r44704)
@@ -206,16 +206,6 @@
         __attribute__nonnull__(3)
         FUNC_MODIFIES(*call_object);
 
-PARROT_EXPORT
-void Parrot_pcc_fill_returns_from_op(PARROT_INTERP,
-    ARGMOD_NULLOK(PMC *call_object),
-    ARGIN(PMC *raw_sig),
-    ARGIN(opcode_t *raw_returns))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(3)
-        __attribute__nonnull__(4)
-        FUNC_MODIFIES(*call_object);
-
 void Parrot_pcc_merge_signature_for_tailcall(PARROT_INTERP,
     ARGMOD_NULLOK(PMC * parent),
     ARGMOD_NULLOK(PMC * tailcall))

Modified: branches/pcc_hackathon_6Mar10/src/call/args.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/call/args.c	Sat Mar  6 13:54:56 2010	(r44703)
+++ branches/pcc_hackathon_6Mar10/src/call/args.c	Sat Mar  6 14:02:38 2010	(r44704)
@@ -1933,60 +1933,6 @@
 
 }
 
-/*
-
-=item C<void Parrot_pcc_fill_returns_from_op(PARROT_INTERP, PMC *call_object,
-PMC *raw_sig, opcode_t *raw_returns)>
-
-Sets return values for the current function call. First it sets the
-positional returns, then the named returns.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-void
-Parrot_pcc_fill_returns_from_op(PARROT_INTERP, ARGMOD_NULLOK(PMC *call_object),
-        ARGIN(PMC *raw_sig), ARGIN(opcode_t *raw_returns))
-{
-    ASSERT_ARGS(Parrot_pcc_fill_returns_from_op)
-
-    static pcc_get_funcs function_pointers = {
-        (intval_func_t)intval_arg_from_op,
-        (numval_func_t)numval_arg_from_op,
-        (string_func_t)string_arg_from_op,
-        (pmc_func_t)pmc_arg_from_op,
-
-        (intval_func_t)intval_constant_from_op,
-        (numval_func_t)numval_constant_from_op,
-        (string_func_t)string_constant_from_op,
-        (pmc_func_t)pmc_constant_from_op,
-    };
-
-    INTVAL raw_return_count = 0;
-
-    GETATTR_FixedIntegerArray_size(interp, raw_sig, raw_return_count);
-
-    /* A null call object is fine if there are no arguments and no returns. */
-    if (PMC_IS_NULL(call_object)) {
-
-        /* Check if we should be throwing errors. This is configured separately
-         * for parameters and return values. */
-        if (raw_return_count > 0
-        &&  PARROT_ERRORS_test(interp, PARROT_ERRORS_RESULT_COUNT_FLAG))
-            Parrot_ex_throw_from_c_args(interp, NULL,
-                EXCEPTION_INVALID_OPERATION,
-                "too many return values: %d passed, 0 expected",
-                raw_return_count);
-        return;
-    }
-
-    fill_results(interp, call_object, raw_sig, raw_returns, &function_pointers);
-
-    return;
-}
-
 
 /*
 


More information about the parrot-commits mailing list