You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by dl...@apache.org on 2006/04/05 07:06:52 UTC
svn commit: r391491 -
/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h
Author: dlydick
Date: Tue Apr 4 22:06:52 2006
New Revision: 391491
URL: http://svn.apache.org/viewcvs?rev=391491&view=rev
Log:
Broke out PTR_CP_SLOT() macro from PTR_CP_ENTRY for separate use.
Small white space changes.
Modified:
incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h
Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h?rev=391491&r1=391490&r2=391491&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h Tue Apr 4 22:06:52 2006
@@ -131,15 +131,27 @@
/*@{ */ /* Begin grouped definitions */
/*!
+ * @brief Report the (cp_info_dup *) of the address of the
+ * class file @p @b pcfs @c @b constant_pool entry at this
+ * index @p @b cpidx.
+ *
+ *
+ * @returns(cp_info_dup *) to a @c @b constant_pool[cpidx]
+ *
+ */
+#define PTR_CP_SLOT(pcfs, cpidx) (pcfs->constant_pool[cpidx])
+
+
+/*!
* @brief Report the (cp_info *) of the address of the
* class file @p @b pcfs @c @b constant_pool entry at this
* index @p @b cpidx.
*
*
- * @returns(cp_info *) to a @c @b constant_pool[cpidx]
+ * @returns(cp_info *) to a @c @b constant_pool[cpidx]->cp
*
*/
-#define PTR_CP_ENTRY(pcfs, cpidx) (&(pcfs->constant_pool[cpidx])->cp)
+#define PTR_CP_ENTRY(pcfs, cpidx) (&PTR_CP_SLOT(pcfs, cpidx)->cp)
/*!
@@ -429,7 +441,7 @@
#define PTR_CP_THIS_STRNAME(pcfs, cpidx) \
((rchar *) &PTR_CP_ENTRY_TYPE(CONSTANT_Utf8_info, pcfs, cpidx) \
- ->bytes[0])
+ ->bytes[0])
/*******************************************************************
@@ -477,24 +489,24 @@
(PTR_CP_ENTRY_TYPE(CONSTANT_Class_info, \
pcfs, \
(PTR_CP_ENTRY_TYPE(type, pcfs, cpidx) \
- ->strname_idx)) \
- ->name_index))
+ ->strname_idx)) \
+ ->name_index))
#define CP2_CLASS_NAME_STRLEN(type, pcfs, cpidx, strname_idx) \
CP_THIS_STRLEN(pcfs, \
(PTR_CP_ENTRY_TYPE(CONSTANT_Class_info, \
pcfs, \
(PTR_CP_ENTRY_TYPE(type, pcfs, cpidx) \
- ->strname_idx)) \
- ->name_index))
+ ->strname_idx)) \
+ ->name_index))
#define PTR_CP2_CLASS_NAME_STRNAME(type, pcfs, cpidx, strname_idx) \
PTR_CP_THIS_STRNAME(pcfs, \
(PTR_CP_ENTRY_TYPE(CONSTANT_Class_info, \
pcfs, \
(PTR_CP_ENTRY_TYPE(type, pcfs, cpidx) \
- ->strname_idx)) \
- ->name_index))
+ ->strname_idx)) \
+ ->name_index))
/*@} */ /* End of grouped definitions */