[svn:parrot] r41647 - in branches/pcc_reapply: include/parrot src/call

[bacek at svn.parrot.org]

Author: bacek
Date: Sat Oct  3 21:07:35 2009
New Revision: 41647
URL: https://trac.parrot.org/parrot/changeset/41647

Log:
[cage] Remove unused Parrot_init_ret_nci and Parrot_init_args_nci functions

Modified:
   branches/pcc_reapply/include/parrot/call.h
   branches/pcc_reapply/src/call/pcc.c

Modified: branches/pcc_reapply/include/parrot/call.h
==============================================================================
--- branches/pcc_reapply/include/parrot/call.h	Sat Oct  3 21:03:30 2009	(r41646)
+++ branches/pcc_reapply/include/parrot/call.h	Sat Oct  3 21:07:35 2009	(r41647)
@@ -174,15 +174,6 @@
         FUNC_MODIFIES(*sti);
 
 PARROT_EXPORT
-void Parrot_init_arg_nci(PARROT_INTERP,
-    ARGOUT(call_state *st),
-    ARGIN(const char *sig))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        FUNC_MODIFIES(*st);
-
-PARROT_EXPORT
 int Parrot_init_arg_op(PARROT_INTERP,
     ARGIN(PMC *ctx),
     ARGIN_NULLOK(opcode_t *pc),
@@ -204,15 +195,6 @@
         FUNC_MODIFIES(*sti);
 
 PARROT_EXPORT
-void Parrot_init_ret_nci(PARROT_INTERP,
-    ARGOUT(call_state *st),
-    ARGIN(const char *sig))
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(2)
-        __attribute__nonnull__(3)
-        FUNC_MODIFIES(*st);
-
-PARROT_EXPORT
 void parrot_pass_args(PARROT_INTERP,
     ARGMOD(PMC *src_ctx),
     ARGMOD(PMC *dest_ctx),
@@ -334,10 +316,6 @@
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(ctx) \
     , PARROT_ASSERT_ARG(sti))
-#define ASSERT_ARGS_Parrot_init_arg_nci __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(st) \
-    , PARROT_ASSERT_ARG(sig))
 #define ASSERT_ARGS_Parrot_init_arg_op __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(ctx) \
@@ -347,10 +325,6 @@
     , PARROT_ASSERT_ARG(ctx) \
     , PARROT_ASSERT_ARG(sig) \
     , PARROT_ASSERT_ARG(sti))
-#define ASSERT_ARGS_Parrot_init_ret_nci __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(st) \
-    , PARROT_ASSERT_ARG(sig))
 #define ASSERT_ARGS_parrot_pass_args __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(src_ctx) \

Modified: branches/pcc_reapply/src/call/pcc.c
==============================================================================
--- branches/pcc_reapply/src/call/pcc.c	Sat Oct  3 21:03:30 2009	(r41646)
+++ branches/pcc_reapply/src/call/pcc.c	Sat Oct  3 21:07:35 2009	(r41647)
@@ -275,76 +275,6 @@
 /* Make sure we don't conflict with any other MAX() macros defined elsewhere */
 #define PARROT_MAX(a, b) (((a)) > (b) ? (a) : (b))
 
-/*
-
-=item C<void Parrot_init_arg_nci(PARROT_INTERP, call_state *st, const char
-*sig)>
-
-Initializes the argument passing state C<call_state> for the given NCI
-signature.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-void
-Parrot_init_arg_nci(PARROT_INTERP, ARGOUT(call_state *st),
-    ARGIN(const char *sig))
-{
-    ASSERT_ARGS(Parrot_init_arg_nci)
-    init_call_stats(st);
-
-    if (PMC_IS_NULL(interp->args_signature))
-        Parrot_init_arg_op(interp, CURRENT_CONTEXT(interp),
-            interp->current_args, &st->src);
-    else
-        Parrot_init_arg_indexes_and_sig_pmc(interp, CURRENT_CONTEXT(interp),
-            interp->current_args, interp->args_signature, &st->src);
-
-    Parrot_init_arg_sig(interp, CURRENT_CONTEXT(interp), sig, NULL, &st->dest);
-}
-
-
-/*
-
-=item C<void Parrot_init_ret_nci(PARROT_INTERP, call_state *st, const char
-*sig)>
-
-Initializes the return value, passing state C<call_state> for the given NCI
-signature.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-void
-Parrot_init_ret_nci(PARROT_INTERP, ARGOUT(call_state *st), ARGIN(const char *sig))
-{
-    ASSERT_ARGS(Parrot_init_ret_nci)
-    PMC *ctx                 = CURRENT_CONTEXT(interp);
-    PMC * const current_cont = Parrot_pcc_get_continuation(interp, ctx);
-
-    /* if this NCI call was a tailcall, return results to caller's get_results
-     * this also means that we pass the caller's register base pointer */
-    if (SUB_FLAG_TAILCALL_ISSET(current_cont))
-        ctx = PARROT_CONTINUATION(current_cont)->to_ctx;
-
-    /* TODO simplify all */
-    Parrot_init_arg_sig(interp, CURRENT_CONTEXT(interp), sig, NULL, &st->src);
-
-    /* Non-constant signatures are stored in ctx->results_signature instead of
-     * in the constants table. */
-    if (Parrot_pcc_get_results_signature(interp, ctx))
-        Parrot_init_arg_indexes_and_sig_pmc(interp, ctx,
-                Parrot_pcc_get_results(interp, ctx),
-                Parrot_pcc_get_results_signature(interp, ctx), &st->dest);
-    else
-        Parrot_init_arg_op(interp, ctx, Parrot_pcc_get_results(interp, ctx), &st->dest);
-
-}
-
 
 /*