[svn:parrot] r45080 - in branches/pcc_hackathon_6Mar10: include/parrot src/call src/pmc
bacek at svn.parrot.org
bacek at svn.parrot.org
Sun Mar 21 09:08:02 UTC 2010
Author: bacek
Date: Sun Mar 21 09:08:02 2010
New Revision: 45080
URL: https://trac.parrot.org/parrot/changeset/45080
Log:
Remove CallContext.results_signature. It's not used anymore
Modified:
branches/pcc_hackathon_6Mar10/include/parrot/context.h
branches/pcc_hackathon_6Mar10/src/call/context.c
branches/pcc_hackathon_6Mar10/src/call/context_accessors.c
branches/pcc_hackathon_6Mar10/src/call/pcc.c
branches/pcc_hackathon_6Mar10/src/pmc/callcontext.pmc
Modified: branches/pcc_hackathon_6Mar10/include/parrot/context.h
==============================================================================
--- branches/pcc_hackathon_6Mar10/include/parrot/context.h Sun Mar 21 09:07:33 2010 (r45079)
+++ branches/pcc_hackathon_6Mar10/include/parrot/context.h Sun Mar 21 09:08:02 2010 (r45080)
@@ -225,12 +225,6 @@
PARROT_EXPORT
PARROT_CAN_RETURN_NULL
-PMC* Parrot_pcc_get_results_signature_func(PARROT_INTERP, ARGIN(PMC *ctx))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
PMC* Parrot_pcc_get_signature_func(PARROT_INTERP, ARGIN(PMC *ctx))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -329,13 +323,6 @@
__attribute__nonnull__(2);
PARROT_EXPORT
-void Parrot_pcc_set_results_signature_func(PARROT_INTERP,
- ARGIN(PMC *ctx),
- ARGIN_NULLOK(PMC *sig))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_EXPORT
void Parrot_pcc_set_signature_func(PARROT_INTERP,
ARGIN(PMC *ctx),
ARGIN_NULLOK(PMC *sig_object))
@@ -452,10 +439,6 @@
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(ctx))
-#define ASSERT_ARGS_Parrot_pcc_get_results_signature_func \
- __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(ctx))
#define ASSERT_ARGS_Parrot_pcc_get_signature_func __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(ctx))
@@ -507,10 +490,6 @@
__attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(ctx))
-#define ASSERT_ARGS_Parrot_pcc_set_results_signature_func \
- __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp) \
- , PARROT_ASSERT_ARG(ctx))
#define ASSERT_ARGS_Parrot_pcc_set_signature_func __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(ctx))
@@ -551,9 +530,6 @@
# define Parrot_pcc_get_caller_ctx(i, c) (__C(c)->caller_ctx)
# define Parrot_pcc_set_caller_ctx(i, c, value) (__C(c)->caller_ctx = (value))
-# define Parrot_pcc_get_results_signature(i, c) (__C(c)->results_signature)
-# define Parrot_pcc_set_results_signature(i, c, value) (__C(c)->results_signature = (value))
-
# define Parrot_pcc_get_namespace(i, c) (__C(c)->current_namespace)
# define Parrot_pcc_set_namespace(i, c, value) (__C(c)->current_namespace = (value))
@@ -615,9 +591,6 @@
# define Parrot_pcc_get_caller_ctx(i, c) Parrot_pcc_get_caller_ctx_func((i), (c))
# define Parrot_pcc_set_caller_ctx(i, c, value) Parrot_pcc_set_caller_ctx_func((i), (c), (value))
-# define Parrot_pcc_get_results_signature(i, c) Parrot_pcc_get_results_signature_func((i), (c))
-# define Parrot_pcc_set_results_signature(i, c, value) Parrot_pcc_set_results_signature_func((i), (c), (value))
-
# define Parrot_pcc_get_namespace(i, c) Parrot_pcc_get_namespace_func((i), (c))
# define Parrot_pcc_set_namespace(i, c, value) Parrot_pcc_set_namespace_func((i), (c), (value))
Modified: branches/pcc_hackathon_6Mar10/src/call/context.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/call/context.c Sun Mar 21 09:07:33 2010 (r45079)
+++ branches/pcc_hackathon_6Mar10/src/call/context.c Sun Mar 21 09:08:02 2010 (r45080)
@@ -315,7 +315,6 @@
if (!PMC_IS_NULL(ctx->current_sub))
return;
- ctx->results_signature = NULL;
ctx->lex_pad = PMCNULL;
ctx->outer_ctx = NULL;
ctx->current_cont = NULL;
Modified: branches/pcc_hackathon_6Mar10/src/call/context_accessors.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/call/context_accessors.c Sun Mar 21 09:07:33 2010 (r45079)
+++ branches/pcc_hackathon_6Mar10/src/call/context_accessors.c Sun Mar 21 09:08:02 2010 (r45080)
@@ -471,40 +471,6 @@
/*
-=item C<PMC* Parrot_pcc_get_results_signature_func(PARROT_INTERP, PMC *ctx)>
-
-=item C<void Parrot_pcc_set_results_signature_func(PARROT_INTERP, PMC *ctx, PMC
-*sig)>
-
-Get/set ptr into code with get_results opcode.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-PARROT_CAN_RETURN_NULL
-PMC*
-Parrot_pcc_get_results_signature_func(PARROT_INTERP, ARGIN(PMC *ctx))
-{
- ASSERT_ARGS(Parrot_pcc_get_results_signature_func)
- Parrot_Context const *c = get_context_struct_fast(interp, ctx);
- return c->results_signature;
-}
-
-PARROT_EXPORT
-void
-Parrot_pcc_set_results_signature_func(PARROT_INTERP, ARGIN(PMC *ctx), ARGIN_NULLOK(PMC *sig))
-{
- ASSERT_ARGS(Parrot_pcc_set_results_signature_func)
- Parrot_Context *c = get_context_struct_fast(interp, ctx);
- PARROT_ASSERT(PMC_IS_NULL(sig) || PObj_is_PMC_TEST(sig));
- c->results_signature = sig;
-}
-
-
-/*
-
=item C<size_t Parrot_pcc_get_pred_offset_func(PARROT_INTERP, PMC *ctx)>
=item C<void Parrot_pcc_set_pred_offset_func(PARROT_INTERP, PMC *ctx, size_t
Modified: branches/pcc_hackathon_6Mar10/src/call/pcc.c
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/call/pcc.c Sun Mar 21 09:07:33 2010 (r45079)
+++ branches/pcc_hackathon_6Mar10/src/call/pcc.c Sun Mar 21 09:08:02 2010 (r45080)
@@ -182,7 +182,8 @@
/*
-=item C<void Parrot_pcc_add_invocant(PARROT_INTERP, PMC *call_obj, PMC *pmc)>
+=item C<static void Parrot_pcc_add_invocant(PARROT_INTERP, PMC *call_obj, PMC
+*pmc)>
Adds the given PMC as an invocant to the given CallContext PMC. You should
never have to use this, and it should go away with interp->current_object.
Modified: branches/pcc_hackathon_6Mar10/src/pmc/callcontext.pmc
==============================================================================
--- branches/pcc_hackathon_6Mar10/src/pmc/callcontext.pmc Sun Mar 21 09:07:33 2010 (r45079)
+++ branches/pcc_hackathon_6Mar10/src/pmc/callcontext.pmc Sun Mar 21 09:08:02 2010 (r45080)
@@ -315,7 +315,6 @@
ATTR PMC *current_cont; /* the return continuation PMC */
ATTR PMC *current_object; /* current object if a method call */
ATTR PMC *current_namespace; /* The namespace we're currently in */
- ATTR PMC *results_signature; /* non-const results signature PMC */
ATTR opcode_t *current_pc; /* program counter of Sub invocation */
ATTR PMC *current_sig; /* temporary CallContext PMC for active call */
@@ -428,9 +427,6 @@
GET_ATTR_current_namespace(INTERP, SELF, tmp);
Parrot_gc_mark_PMC_alive(INTERP, tmp);
- GET_ATTR_results_signature(INTERP, SELF, tmp);
- Parrot_gc_mark_PMC_alive(INTERP, tmp);
-
GET_ATTR_current_sig(INTERP, SELF, tmp);
Parrot_gc_mark_PMC_alive(INTERP, tmp);
@@ -803,8 +799,6 @@
GET_ATTR_current_namespace(INTERP, SELF, value);
else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "handlers")))
GET_ATTR_handlers(INTERP, SELF, value);
- else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "results_signature")))
- GET_ATTR_results_signature(INTERP, SELF, value);
else if (Parrot_str_equal(INTERP, key, CONST_STRING(INTERP, "current_HLL"))) {
/* This function from src/hash.c. */
/* We probably have to move it to more suitable place */
More information about the parrot-commits
mailing list