[svn:parrot] r43339 - in branches/remove_Parrot_ex_calc_handler_offset: docs include/parrot src

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Dec 31 14:13:18 2009
New Revision: 43339
URL: https://trac.parrot.org/parrot/changeset/43339

Log:
Remove Parrot_ex_calc_handler_offset per http://trac.parrot.org/parrot/ticket/546.

Modified:
   branches/remove_Parrot_ex_calc_handler_offset/docs/embed.pod
   branches/remove_Parrot_ex_calc_handler_offset/include/parrot/exceptions.h
   branches/remove_Parrot_ex_calc_handler_offset/src/exceptions.c

Modified: branches/remove_Parrot_ex_calc_handler_offset/docs/embed.pod
==============================================================================
--- branches/remove_Parrot_ex_calc_handler_offset/docs/embed.pod	Thu Dec 31 12:52:04 2009	(r43338)
+++ branches/remove_Parrot_ex_calc_handler_offset/docs/embed.pod	Thu Dec 31 14:13:18 2009	(r43339)
@@ -735,8 +735,6 @@
 
 =item C<Parrot_ex_build_exception>
 
-=item C<Parrot_ex_calc_handler_offset>
-
 =item C<Parrot_exit>
 
 =item C<Parrot_ex_mark_unhandled>

Modified: branches/remove_Parrot_ex_calc_handler_offset/include/parrot/exceptions.h
==============================================================================
--- branches/remove_Parrot_ex_calc_handler_offset/include/parrot/exceptions.h	Thu Dec 31 12:52:04 2009	(r43338)
+++ branches/remove_Parrot_ex_calc_handler_offset/include/parrot/exceptions.h	Thu Dec 31 14:13:18 2009	(r43339)
@@ -154,10 +154,6 @@
         __attribute__nonnull__(1);
 
 PARROT_EXPORT
-size_t Parrot_ex_calc_handler_offset(PARROT_INTERP)
-        __attribute__nonnull__(1);
-
-PARROT_EXPORT
 void Parrot_ex_mark_unhandled(PARROT_INTERP, ARGIN(PMC *exception))
         __attribute__nonnull__(1)
         __attribute__nonnull__(2);
@@ -235,8 +231,6 @@
     , PARROT_ASSERT_ARG(jp))
 #define ASSERT_ARGS_Parrot_ex_build_exception __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_ex_calc_handler_offset __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_ex_mark_unhandled __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(exception))

Modified: branches/remove_Parrot_ex_calc_handler_offset/src/exceptions.c
==============================================================================
--- branches/remove_Parrot_ex_calc_handler_offset/src/exceptions.c	Thu Dec 31 12:52:04 2009	(r43338)
+++ branches/remove_Parrot_ex_calc_handler_offset/src/exceptions.c	Thu Dec 31 14:13:18 2009	(r43339)
@@ -491,6 +491,8 @@
 
 Mark an exception as unhandled, as part of rethrowing it.
 
+=back
+
 =cut
 
 */
@@ -505,40 +507,6 @@
 
 /*
 
-=item C<size_t Parrot_ex_calc_handler_offset(PARROT_INTERP)>
-
-Retrieve an exception from the concurrency scheduler, prepare a call to the
-handler, and return the offset to the handler so it can become the next op in
-the runloop.
-
-TT #546: This function appears to be unused.
-
-=cut
-
-*/
-
-PARROT_EXPORT
-size_t
-Parrot_ex_calc_handler_offset(PARROT_INTERP)
-{
-    ASSERT_ARGS(Parrot_ex_calc_handler_offset)
-    PMC * const exception = VTABLE_pop_pmc(interp, interp->scheduler);
-
-    /* now fill rest of exception, locate handler and get
-     * destination of handler */
-    opcode_t * const handler_address = Parrot_ex_throw_from_op(interp, exception, NULL);
-
-    if (handler_address == NULL)
-        PANIC(interp, "Unable to calculate opcode address for exception handler");
-
-    /* return the *offset* of the handler */
-    return handler_address - interp->code->base.data;
-}
-
-/*
-
-=back
-
 =head2 Error Functions
 
 =over 4