[svn:parrot] r38249 - in branches/headercleanup: . include/parrot src src/runcore
chromatic at svn.parrot.org
chromatic at svn.parrot.org
Tue Apr 21 20:02:06 UTC 2009
Author: chromatic
Date: Tue Apr 21 20:02:05 2009
New Revision: 38249
URL: https://trac.parrot.org/parrot/changeset/38249
Log:
[runcore] Absorbed src/runops_cores.h into include/parrot/runcore_api.h.
Deleted:
branches/headercleanup/src/runops_cores.h
Modified:
branches/headercleanup/MANIFEST
branches/headercleanup/include/parrot/runcore_api.h
branches/headercleanup/src/runcore/main.c
branches/headercleanup/src/runops_cores.c
Modified: branches/headercleanup/MANIFEST
==============================================================================
--- branches/headercleanup/MANIFEST Tue Apr 21 19:21:12 2009 (r38248)
+++ branches/headercleanup/MANIFEST Tue Apr 21 20:02:05 2009 (r38249)
@@ -1453,7 +1453,6 @@
src/pmc_freeze.c []
src/runcore/main.c []
src/runops_cores.c []
-src/runops_cores.h []
src/scheduler.c []
src/spf_render.c []
src/spf_vtable.c []
Modified: branches/headercleanup/include/parrot/runcore_api.h
==============================================================================
--- branches/headercleanup/include/parrot/runcore_api.h Tue Apr 21 19:21:12 2009 (r38248)
+++ branches/headercleanup/include/parrot/runcore_api.h Tue Apr 21 20:02:05 2009 (r38249)
@@ -9,9 +9,81 @@
#ifndef PARROT_RUNCORE_API_H_GUARD
#define PARROT_RUNCORE_API_H_GUARD
+#include "parrot/parrot.h"
+#include "parrot/op.h"
+
# define DO_OP(PC, INTERP) ((PC) = (((INTERP)->op_func_table)[*(PC)])((PC), (INTERP)))
-#endif /* PARROT_RUNCORE_API_H_GUARD */
+/* HEADERIZER BEGIN: src/runops_cores.c */
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_cgoto_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_debugger_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_fast_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_gc_debug_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_profile_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+opcode_t * runops_slow_core(PARROT_INTERP, ARGIN(opcode_t *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+#define ASSERT_ARGS_runops_cgoto_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+#define ASSERT_ARGS_runops_debugger_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+#define ASSERT_ARGS_runops_fast_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+#define ASSERT_ARGS_runops_gc_debug_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+#define ASSERT_ARGS_runops_profile_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+#define ASSERT_ARGS_runops_slow_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc)
+
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
+/* HEADERIZER END: src/runops_cores.c */
+
+opcode_t *runops_fast_core(PARROT_INTERP, opcode_t *);
+
+opcode_t *runops_cgoto_core(PARROT_INTERP, opcode_t *);
+
+opcode_t *runops_slow_core(PARROT_INTERP, opcode_t *);
+
+opcode_t *runops_profile_core(PARROT_INTERP, opcode_t *);
+
+#endif /* PARROT_RUNOPS_CORES_H_GUARD */
/*
Modified: branches/headercleanup/src/runcore/main.c
==============================================================================
--- branches/headercleanup/src/runcore/main.c Tue Apr 21 19:21:12 2009 (r38248)
+++ branches/headercleanup/src/runcore/main.c Tue Apr 21 20:02:05 2009 (r38249)
@@ -37,7 +37,6 @@
#include "parrot/oplib/core_ops.h"
#include "parrot/oplib/core_ops_switch.h"
#include "parrot/oplib/ops.h"
-#include "../runops_cores.h"
#if JIT_CAPABLE
# include "parrot/exec.h"
# include "../jit.h"
Modified: branches/headercleanup/src/runops_cores.c
==============================================================================
--- branches/headercleanup/src/runops_cores.c Tue Apr 21 19:21:12 2009 (r38248)
+++ branches/headercleanup/src/runops_cores.c Tue Apr 21 20:02:05 2009 (r38249)
@@ -238,10 +238,9 @@
*/
-#include "runops_cores.h"
+#include "parrot/runcore_api.h"
#include "parrot/embed.h"
#include "trace.h"
-#include "parrot/runcore_api.h"
#ifdef HAVE_COMPUTED_GOTO
# include "parrot/oplib/core_ops_cg.h"
Deleted: branches/headercleanup/src/runops_cores.h
==============================================================================
--- branches/headercleanup/src/runops_cores.h Tue Apr 21 20:02:05 2009 (r38248)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,95 +0,0 @@
-/* runops_cores.h
- * Copyright (C) 2001-2006, Parrot Foundation.
- * SVN Info
- * $Id$
- * Overview:
- * Header for runops cores.
- * Data Structure and Algorithms:
- * History:
- * Notes:
- * References:
- */
-
-#ifndef PARROT_RUNOPS_CORES_H_GUARD
-#define PARROT_RUNOPS_CORES_H_GUARD
-
-#include "parrot/parrot.h"
-#include "parrot/op.h"
-
-/* HEADERIZER BEGIN: src/runops_cores.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_cgoto_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_debugger_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_fast_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_gc_debug_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_profile_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-opcode_t * runops_slow_core(PARROT_INTERP, ARGIN(opcode_t *pc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-#define ASSERT_ARGS_runops_cgoto_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-#define ASSERT_ARGS_runops_debugger_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-#define ASSERT_ARGS_runops_fast_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-#define ASSERT_ARGS_runops_gc_debug_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-#define ASSERT_ARGS_runops_profile_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-#define ASSERT_ARGS_runops_slow_core __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(pc)
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/runops_cores.c */
-
-opcode_t *runops_fast_core(PARROT_INTERP, opcode_t *);
-
-opcode_t *runops_cgoto_core(PARROT_INTERP, opcode_t *);
-
-opcode_t *runops_slow_core(PARROT_INTERP, opcode_t *);
-
-opcode_t *runops_profile_core(PARROT_INTERP, opcode_t *);
-
-#endif /* PARROT_RUNOPS_CORES_H_GUARD */
-
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4:
- */
More information about the parrot-commits
mailing list