harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r397712 [1/2] - /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/
Date Fri, 28 Apr 2006 01:41:48 GMT
Author: dlydick
Date: Thu Apr 27 18:41:46 2006
New Revision: 397712

URL: http://svn.apache.org/viewcvs?rev=397712&view=rev
Log:
Renamed cp_info_dup to cp_info_mem_align and
renamed attribute_info_dup to attribute_info_mem_align
to better describe their functions.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfattrib.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmacros.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmsgs.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvm.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/method.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/method.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/nts.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/nts.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/opcode.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/opmacros.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/unicode.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/unicode.h
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/utf.c
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/utf.h

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.c Thu Apr 27 18:41:46 2006
@@ -76,10 +76,10 @@
  *
  */
 static jvm_attribute_index attribute_name_common_find(
-                               ClassFile           *pcfs,
-                               u2                   acount,
-                               attribute_info_dup **patr,
-                               cp_info_dup         *atrname)
+                               ClassFile                 *pcfs,
+                               u2                         acount,
+                               attribute_info_mem_align **patr,
+                               cp_info_mem_align         *atrname)
 {
     ARCH_FUNCTION_NAME(attribute_name_common_find);
 
@@ -129,7 +129,7 @@
 static jvm_attribute_index attribute_enum_common_find(
                                ClassFile                 *pcfs,
                                u2                         acount,
-                               attribute_info_dup       **patr,
+                               attribute_info_mem_align  **patr,
                                classfile_attribute_enum   atrenum)
 {
     ARCH_FUNCTION_NAME(attribute_enum_common_find);
@@ -173,9 +173,9 @@
  *
  */
 jvm_attribute_index
-    attribute_find_in_field_by_cp_entry(jvm_class_index  clsidx,
-                                        jvm_field_index  fldidx,
-                                        cp_info_dup     *atrname)
+    attribute_find_in_field_by_cp_entry(jvm_class_index    clsidx,
+                                        jvm_field_index    fldidx,
+                                        cp_info_mem_align *atrname)
 {
     ARCH_FUNCTION_NAME(attribute_find_in_field_by_cp_entry);
 
@@ -273,9 +273,9 @@
  *
  */
 jvm_attribute_index
-    attribute_find_in_method_by_cp_entry(jvm_class_index   clsidx,
-                                         jvm_method_index  mthidx,
-                                         cp_info_dup      *atrname)
+    attribute_find_in_method_by_cp_entry(jvm_class_index    clsidx,
+                                         jvm_method_index   mthidx,
+                                         cp_info_mem_align *atrname)
 {
     ARCH_FUNCTION_NAME(attribute_find_in_method_by_cp_entry);
 
@@ -371,8 +371,8 @@
  *
  */
 jvm_attribute_index
-    attribute_find_in_class_by_cp_entry(jvm_class_index  clsidx,
-                                        cp_info_dup     *atrname)
+    attribute_find_in_class_by_cp_entry(jvm_class_index    clsidx,
+                                        cp_info_mem_align *atrname)
 {
     ARCH_FUNCTION_NAME(attribute_find_in_class_by_cp_entry);
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.h?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/attribute.h Thu Apr 27 18:41:46 2006
@@ -48,9 +48,9 @@
 
 
 extern jvm_attribute_index attribute_find_in_field_by_cp_entry(
-                                   jvm_class_index  clsidx,
-                                   jvm_field_index  fldidx,
-                                   cp_info_dup     *atrname);
+                                   jvm_class_index    clsidx,
+                                   jvm_field_index    fldidx,
+                                   cp_info_mem_align *atrname);
 
 extern jvm_attribute_index attribute_find_in_field_by_enum(
                                    jvm_class_index  clsidx,
@@ -58,9 +58,9 @@
                                    rint             atrenum);
 
 extern jvm_attribute_index attribute_find_in_method_by_cp_entry(
-                                   jvm_class_index  clsidx,
-                                   jvm_method_index mthidx,
-                                   cp_info_dup     *atrname);
+                                   jvm_class_index    clsidx,
+                                   jvm_method_index   mthidx,
+                                   cp_info_mem_align *atrname);
 
 extern jvm_attribute_index attribute_find_in_method_by_enum(
                                    jvm_class_index  clsidx,
@@ -68,8 +68,8 @@
                                    rint             atrenum);
 
 extern jvm_attribute_index attribute_find_in_class_by_cp_entry(
-                                   jvm_class_index  clsidx,
-                                   cp_info_dup     *atrname);
+                                   jvm_class_index    clsidx,
+                                   cp_info_mem_align *atrname);
 
 extern jvm_attribute_index attribute_find_in_class_by_enum(
                                    jvm_class_index  clsidx,

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfattrib.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfattrib.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfattrib.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfattrib.c Thu Apr 27 18:41:46 2006
@@ -251,21 +251,21 @@
 
 /*!
  * @brief Conveniently reference the XXX_attribute contained in
- * an indirect <b><code>attribute_info_dup **dst</code></b>.
+ * an indirect <b><code>attribute_info_mem_align **dst</code></b>.
  *
  * After putting in the 4-byte access alignment changes,
  * it became obvious that what was once (*dst)->member
  * had become quite cumbersome.  Therefore, in order to
- * simplify access through (attribute_info_dup *)->ai.member
+ * simplify access through (attribute_info_mem_align *)->ai.member
  * constructions, including appropriate casting, the following
  * macro is offered to take care of the most common usage.
  * The few other references are unchanged, and the code is
  * easier to understand.
  *
  * Notice that @link #DST_CODE_AI() DST_XXX_AI()@endlink references
- * a <b><code>attribute_info_dup *dst</code></b>, while 
+ * a <b><code>attribute_info_mem_align *dst</code></b>, while 
  * @link #DST_CODE_AI() PTR_DST_XXX_AI()@endlink
- * references a <b><code>attribute_info_dup **dst</code></b>.
+ * references a <b><code>attribute_info_mem_align **dst</code></b>.
  */
 #define PTR_DST_CONSTANTVALUE_AI(dst) \
                                ((ConstantValue_attribute *) &(*dst)->ai)
@@ -299,14 +299,14 @@
 /*!
  * @brief Conveniently reference an
  * @link Code_attribute Xxx_attribute@endlink contained in
- * a <b><code>attribute_info_dup *dst</code></b>, namely, with less
- * pointer indirection.
+ * a <b><code>attribute_info_mem_align *dst</code></b>, namely, with
+ * less pointer indirection.
  *
  * This is a counterpart for cfattrib_unload_attribute() where
  * no indirection is needed.  Notice that
  * @link #PTR_DST_CODE_AI() PTR_DST_XXX_AI()@endlink references
- * a <b><code>attribute_info_dup **dst</code></b>, while this
- * macro references a <b><code>attribute_info_dup *dst</code></b>.
+ * a <b><code>attribute_info_mem_align **dst</code></b>, while this
+ * macro references a <b><code>attribute_info_mem_align *dst</code></b>.
  *
  */
 #define     DST_CODE_AI(dst) ((Code_attribute *) &dst->ai)
@@ -327,33 +327,33 @@
 
 /*!
  * @brief Conveniently reference the Exceptions_attribute contained in
- * an indirect <b><code>attribute_info_dup **dst</code></b>.
+ * an indirect <b><code>attribute_info_mem_align **dst</code></b>.
  *
  * After putting in the 4-byte access alignment changes,
  * it became obvious that what was once (*dst)->member
  * had become quite cumbersome.  Therefore, in order to
- * simplify access through (attribute_info_dup *)->ai.member
+ * simplify access through (attribute_info_mem_align *)->ai.member
  * constructions, including appropriate casting, the following
  * macro is offered to take care of the most common usage.
  * The few other references are unchanged, and the code is
  * easier to understand.
  *
  * Notice that @link #DST_CODE_AI() DST_CODE_AI()@endlink references
- * a <b><code>attribute_info_dup *dst</code></b>, while this
- * macro references a <b><code>attribute_info_dup **dst</code></b>.
+ * a <b><code>attribute_info_mem_align *dst</code></b>, while this
+ * macro references a <b><code>attribute_info_mem_align **dst</code></b>.
  */
 #define PTR_DST_CODE_AI(dst) ((Code_attribute *) &(*dst)->ai)
 
 /*!
  * @brief Conveniently reference the Code_attribute contained in
- * a <b><code>attribute_info_dup *dst</code></b>, namely, with less
- * pointer indirection.
+ * a <b><code>attribute_info_mem_align *dst</code></b>, namely, with
+ * less pointer indirection.
  *
  * This is a counterpart for cfattrib_unload_attribute() where
  * no indirection is needed.  Notice that
  * @link #PTR_DST_CODE_AI() PTR_DST_CODE_AI()@endlink references
- * a <b><code>attribute_info_dup **dst</code></b>, while this
- * macro references a <b><code>attribute_info_dup *dst</code></b>.
+ * a <b><code>attribute_info_mem_align **dst</code></b>, while this
+ * macro references a <b><code>attribute_info_mem_align *dst</code></b>.
  *
  */
 #define     DST_CODE_AI(dst) ((Code_attribute *) &dst->ai)
@@ -793,8 +793,8 @@
  *
  * @param  pcfs      Pointer to (partially) parsed ClassFile area
  *
- * @param  dst       Pointer to a attribute_info_dup[] address telling
- *                   where in the heap this attribute will be
+ * @param  dst       Pointer to a attribute_info_mem_align[] address
+ *                   telling where in the heap this attribute will be
  *                   copied from the source area.
  *
  * @param  src       Pointer to an attribute in class file image.
@@ -812,9 +812,9 @@
  *
  */
 
-u1 *cfattrib_load_attribute(ClassFile           *pcfs,
-                            attribute_info_dup **dst,
-                            attribute_info      *src)
+u1 *cfattrib_load_attribute(ClassFile                 *pcfs,
+                            attribute_info_mem_align **dst,
+                            attribute_info            *src)
 {
     ARCH_FUNCTION_NAME(cfattrib_load_attribute);
 
@@ -882,13 +882,16 @@
     pnext_src += tmplen;
 
 
-    /* Calculate total size of this (attribute_info_dup) area in dst */
-    tmplen = sizeof(attribute_info_dup)
+    /*
+     * Calculate total size of this (attribute_info_mem_align) area
+     * in dst
+     */
+    tmplen = sizeof(attribute_info_mem_align)
              - sizeof(u1)
              + tmpatr.attribute_length;
 
     /* Allocate a heap location to store this attribute */
-    *dst = (attribute_info_dup *) HEAP_GET_METHOD(tmplen, rfalse);
+    *dst = (attribute_info_mem_align *) HEAP_GET_METHOD(tmplen, rfalse);
 
     /*
      * Copy attribute data to heap.  The @b info item is optional,
@@ -1062,14 +1065,14 @@
             if (0 == atbllen)
             {
                 PTR_DST_CODE_AI(dst)->attributes =
-                    (attribute_info_dup **) rnull;
+                    (attribute_info_mem_align **) rnull;
             }
             else
             {
                 PTR_DST_CODE_AI(dst)->attributes =
                     HEAP_GET_METHOD(PTR_DST_CODE_AI(dst)
                                       ->attributes_count *
-                                    sizeof(attribute_info_dup *),
+                                    sizeof(attribute_info_mem_align *),
                                     rtrue);
 
 
@@ -1104,7 +1107,7 @@
                     pabytes =
                         cfattrib_load_attribute(
                             pcfs,
-                            (attribute_info_dup **)
+                            (attribute_info_mem_align **)
                                 &(PTR_DST_CODE_AI(dst)
                                     ->attributes)[atridx],
                             (attribute_info *) pabytes);
@@ -1851,7 +1854,7 @@
  *
  * @param  pcfs      Pointer to (partially) parsed ClassFile area
  *
- * @param  dst       Pointer to a attribute_info_dup allocation
+ * @param  dst       Pointer to a attribute_info_mem_align allocation
  *                   where this attribute is stored in the heap
  *
  *
@@ -1862,8 +1865,8 @@
  *
  */
 
-rvoid cfattrib_unload_attribute(ClassFile  *pcfs,
-                                attribute_info_dup *dst)
+rvoid cfattrib_unload_attribute(ClassFile                *pcfs,
+                                attribute_info_mem_align *dst)
 {
     ARCH_FUNCTION_NAME(cfattrib_unload_attribute);
 

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=397712&r1=397711&r2=397712&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 Thu Apr 27 18:41:46 2006
@@ -55,13 +55,13 @@
  * @link #CONSTANT_Class_info CONSTANT_xxxxx_info@endlink typed pointer,
  * stripping off the generic prefix bytes.
  *
- * Adjust a generic @c @b constant_pool entry (cp_info_dup *)
+ * Adjust a generic @c @b constant_pool entry (cp_info_mem_align *)
  * into its corresponding
  * @link #CONSTANT_Class_info CONSTANT_xxxxx_info@endlink typed pointer
  * by changing the pointer to point not to the beginning of the
- * (cp_info_dup) structure, but to its @p @b cp member, which is where
- * the data actually begins.  This is  useful for argument passing
- * when the whole (cp_info_dup *) is available.  The original
+ * (cp_info_mem_align) structure, but to its @p @b cp member, which is
+ * where the data actually begins.  This is  useful for argument passing
+ * when the whole (cp_info_mem_align *) is available.  The original
  * adjustment was made in the first place to support native member
  * accesses on real machine architectures that are picky about
  * multi-byte accesses that are not aligned to addresses of the
@@ -131,12 +131,12 @@
 /*@{ */ /* Begin grouped definitions */
 
 /*!
- * @brief Report the (cp_info_dup *) of the address of the
+ * @brief Report the (cp_info_mem_align *) 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]
+ * @returns(cp_info_mem_align *) to a @c @b constant_pool[cpidx]
  *
  */
 #define PTR_CP_SLOT(pcfs, cpidx) (pcfs->constant_pool[cpidx])
@@ -854,11 +854,11 @@
 
 #ifdef ARCH_LITTLE_ENDIAN
 #define CP_ITEM_SWAP_U2(type, member) \
-    pcpu2 = &(((type *) &pcpd->cp)->member); \
+    pcpu2 = &(((type *) &pcpma->cp)->member); \
     MACHINE_JSHORT_SWAP_PTR(pcpu2)
 
 #define CP_ITEM_SWAP_U4(type, member) \
-    pcpu4 = &(((type *) &pcpd->cp)->member); \
+    pcpu4 = &(((type *) &pcpma->cp)->member); \
     MACHINE_JINT_SWAP_PTR(pcpu4)
 
 #else
@@ -878,11 +878,11 @@
  * address alignment purposes.
  *
  * Fill pattern bytes are provided for (cp_info) and (attribute_info)
- * structure alignment within (cp_info_dup) and (attribute_info_dup)
- * structures.  This assures that 2- and 4-byte alignments needed
- * for the beginning of those structures is followed (after the first
- * element, the @p @b tag and @p @b attribute_name_index elements,
- * respectively).
+ * structure alignment within (cp_info_mem_align) and
+ * (attribute_info_mem_align) structures.  This assures that 2- and
+ * 4-byte alignments needed for the beginning of those structures is
+ * followed (after the first element, the @p @b tag
+ * and @p @b attribute_name_index elements, respectively).
  *
  * Real machine architectures that have issues with non-aligned
  * multi-byte accesses do @e not like the fact that ClassFile
@@ -892,9 +892,9 @@
  * bytes in their @link #attribute_info info@endlink fields.
  * Due to the streaming nature of Java class files, subsequent
  * attributes may thus be misaligned, even though they may only contain
- * fields with an even number of bytes.  Thus the cp_info_dup and
- * attribute_info_dup structures were devised to suppress problems like
- * this.  When the class file is read, all structure accesses are
+ * fields with an even number of bytes.  Thus the cp_info_mem_align and
+ * attribute_info_mem_align structures were devised to suppress problems
+ * like this.  When the class file is read, all structure accesses are
  * performed on blocks of allocated memory that start on 4- or 8-byte
  * address boundaries and pad the first few bytes so that all 2- and
  * 4-byte accesses are on 2- or 4-byte boundaries.
@@ -903,16 +903,16 @@
  * three @b FILL_INFO_NOTUSED_Ux fill fields for assigning values
  * to @b notusedXX fields.
  *
- * @see cp_info_dup
- * @see attribute_info_dup
+ * @see cp_info_mem_align
+ * @see attribute_info_mem_align
  * @see ARCH_ODD4_ADDRESS_SIGSEGV
  * @see ARCH_ODD2_ADDRESS_SIGSEGV
  *
  * @todo HARMONY-6-jvm-cfmacros.h-2 WATCH OUT!  When changing
  *       CP_INFO_NUM_EMPTIES or ATTRIBUTE_INFO_NUM_EMPTIES, beware
  *       of not having he right number of @c @b struct->empty[x]=FILL
- *       lines in the cp_info_dup and attribute_info_dup assignments!
- *       Could eliminate these, but they are useful for
+ *       lines in the cp_info_mem_align and attribute_info_mem_align
+ *       assignments! Could eliminate these, but they are useful for
  *       debugging.
  *
  * @todo HARMONY-6-jvm-cfmacros.h-3 4-byte unused fields are meaningful

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmsgs.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmsgs.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmsgs.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/cfmsgs.c Thu Apr 27 18:41:46 2006
@@ -550,8 +550,8 @@
  *
  * @param  atr    Pointer to an attribute area.  WARNING:  This
  *                pointer MUST be 4-byte aligned to suppress
- *                @b SIGSEGV.  Such logic is already taken care
- *                of by virtue of it being an (attribute_info_dup *)
+ *                @b SIGSEGV.  Such logic is already taken care of by
+ *                virtue of it being an (attribute_info_mem_align *)
  *                type instead of as (attribute_info *).  This
  *                processing happens in cfattrib_load_attribute()
  *                after reading an attribute from the class file
@@ -566,9 +566,9 @@
  *
  */
 
-rvoid cfmsgs_atrmsg(rchar *fn,
-                    ClassFile *pcfs,
-                    attribute_info_dup *atr)
+rvoid cfmsgs_atrmsg(rchar                    *fn,
+                    ClassFile                *pcfs,
+                    attribute_info_mem_align *atr)
 {
     ARCH_FUNCTION_NAME(cfmsgs_atrmsg);
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.c Thu Apr 27 18:41:46 2006
@@ -889,7 +889,7 @@
  *         @link #jvm_class_index_null jvm_class_index_null@endlink.
  *
  */
-jvm_class_index class_find_by_cp_entry(cp_info_dup *clsname)
+jvm_class_index class_find_by_cp_entry(cp_info_mem_align *clsname)
 {
     ARCH_FUNCTION_NAME(class_find_by_cp_entry);
 
@@ -948,7 +948,7 @@
 {
     ARCH_FUNCTION_NAME(class_find_by_prchar);
 
-    cp_info_dup *pcip_clsname = nts_prchar2utf(clsname);
+    cp_info_mem_align *pcip_clsname = nts_prchar2utf(clsname);
 
     jvm_method_index rc =
         class_find_by_cp_entry(pcip_clsname);
@@ -1122,9 +1122,9 @@
 /*@{ */ /* Begin grouped definitions */
 
 jvm_class_index
-    class_load_from_cp_entry_utf(cp_info_dup *clsname,
-                                 rboolean     find_registerNatives,
-                                 jint        *arraylength)
+    class_load_from_cp_entry_utf(cp_info_mem_align *clsname,
+                                 rboolean          find_registerNatives,
+                                 jint              *arraylength)
 {
     ARCH_FUNCTION_NAME(class_load_from_cp_entry_utf);
 
@@ -1233,7 +1233,7 @@
         } /* if arraydims */
         else
         {
-            cp_info_dup *pnofmt =
+            cp_info_mem_align *pnofmt =
                              utf_utf2utf_unformatted_classname(clsname);
 
             pcname = classpath_get_from_cp_entry_utf(pnofmt);
@@ -1389,7 +1389,7 @@
 {
     ARCH_FUNCTION_NAME(class_load_from_prchar);
 
-    cp_info_dup *cp_clsname = nts_prchar2utf(clsname);
+    cp_info_mem_align *cp_clsname = nts_prchar2utf(clsname);
 
     jvm_class_index clsidx =
         class_load_from_cp_entry_utf(cp_clsname,
@@ -1406,9 +1406,9 @@
 #if 0
 /* Can use if want to add @b pcfs to parm list or some such */
 jvm_class_index
-    class_load_from_cp_entry_class(cp_info_dup *clsname,
-                                   rboolean     find_registerNatives,
-                                   jint        *arraylength)
+    class_load_from_cp_entry_class(cp_info_mem_align *clsname,
+                                   rboolean        find_registerNatives,
+                                   jint              *arraylength)
 {
     ARCH_FUNCTION_NAME(class_load_from_cp_entry_class);
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.h?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/class.h Thu Apr 27 18:41:46 2006
@@ -282,7 +282,8 @@
 extern jvm_class_index class_reload(jvm_class_index clsidxOLD);
 extern jvm_class_index class_static_delete(jvm_class_index clsidx,
                                            rboolean        rmref);
-extern jvm_class_index class_find_by_cp_entry(cp_info_dup *clsname);
+extern jvm_class_index class_find_by_cp_entry(
+                                            cp_info_mem_align *clsname);
 extern jvm_class_index class_find_by_prchar(rchar *clsname);
 extern jvm_class_index class_load_primative(u1 basetype);
 extern jvm_class_index class_load_from_prchar(rchar    *clsname,
@@ -290,7 +291,7 @@
                                                    find_registerNatives,
                                               jint     *arraylength);
 extern jvm_class_index class_load_from_cp_entry_utf(
-                                             cp_info_dup *clsname,
+                                             cp_info_mem_align *clsname,
                                              rboolean
                                                    find_registerNatives,
                                              jint        *arraylength);

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c Thu Apr 27 18:41:46 2006
@@ -139,18 +139,19 @@
 
     pcfs->constant_pool_count = 3; /* 1 class, 1 string, + j/l/Object */
     pcfs->constant_pool = HEAP_GET_DATA(pcfs->constant_pool_count *
-                                        sizeof(cp_info_dup *), rfalse);
+                                          sizeof(cp_info_mem_align *),
+                                        rfalse);
 
 
     /*!
      * @internal Since @c @b java.lang.Object is implied,
      *           don't need this slot.
      */
-    pcfs->constant_pool[0] = (cp_info_dup *) rnull;
+    pcfs->constant_pool[0] = (cp_info_mem_align *) rnull;
 
 
     /* Allocate CONSTANT_Utf8_info member.  Default of u1[1] okay */
-    pcfs->constant_pool[1] = HEAP_GET_DATA(sizeof(cp_info_dup) +
+    pcfs->constant_pool[1] = HEAP_GET_DATA(sizeof(cp_info_mem_align) +
                                            sizeof(CONSTANT_Utf8_info) -
                                            sizeof(cp_info), rtrue);
     CONSTANT_Utf8_info *putf =PTR_THIS_CP_Utf8(pcfs->constant_pool[1]);
@@ -159,7 +160,7 @@
     putf->bytes[0] = basetype; /* single (u1) character */
 
     /* Allocate CONSTANT_Class_info member */
-    pcfs->constant_pool[2] = HEAP_GET_DATA(sizeof(cp_info_dup) +
+    pcfs->constant_pool[2] = HEAP_GET_DATA(sizeof(cp_info_mem_align) +
                                            sizeof(CONSTANT_Class_info) -
                                            sizeof(cp_info), rfalse);
     CONSTANT_Class_info *pci =PTR_THIS_CP_Class(pcfs->constant_pool[2]);
@@ -190,7 +191,7 @@
     pcfs->methods = (method_info **) rnull;
 
     pcfs->attributes_count = 0;
-    pcfs->attributes = (attribute_info_dup **) rnull;
+    pcfs->attributes = (attribute_info_mem_align **) rnull;
 
     return(pcfs);
 
@@ -200,7 +201,7 @@
 /*!
  * @def ALLOC_CP_INFO()
  *
- * @brief Allocate a cp_info_dup structure containing any generic
+ * @brief Allocate a cp_info_mem_align structure containing any generic
  * type of @c @b constant_pool entry.
  *
  * Allocate space from heap, populate from class file data,
@@ -225,12 +226,12 @@
     misc_adj = sizeof(u1) * CP_INFO_NUM_EMPTIES;                       \
                                                                        \
     cf_item_size = sizeof(spec_typedef)-sizeof(struct binding_struct); \
-    pcpd = HEAP_GET_METHOD(misc_adj + sizeof(spec_typedef), rfalse);   \
-    portable_memcpy(((rbyte *) pcpd) + misc_adj,pcpbytes,cf_item_size);\
+    pcpma = HEAP_GET_METHOD(misc_adj + sizeof(spec_typedef), rfalse);  \
+    portable_memcpy(((rbyte *)pcpma) + misc_adj,pcpbytes,cf_item_size);\
                                                                        \
-    pcpd->empty[0] = FILL_INFO_DUP0;                                   \
-    pcpd->empty[1] = FILL_INFO_DUP1;                                   \
-    pcpd->empty[2] = FILL_INFO_DUP2; /* Extra ; */
+    pcpma->empty[0] = FILL_INFO_DUP0;                                  \
+    pcpma->empty[1] = FILL_INFO_DUP1;                                  \
+    pcpma->empty[2] = FILL_INFO_DUP2; /* Extra ; */
 
 
 /*!
@@ -263,7 +264,7 @@
 #define ALLOC_CF_ITEM(spec_typedef, pbytes, pcfsi, binding_struct)     \
     cf_item_size = sizeof(spec_typedef) -                              \
                    sizeof(struct binding_struct) -                     \
-                   sizeof(attribute_info_dup **);                      \
+                   sizeof(attribute_info_mem_align **);                \
     pcfsi = HEAP_GET_METHOD(sizeof(spec_typedef), rfalse);             \
     portable_memcpy(((rbyte *) pcfsi),pbytes,cf_item_size);/*Extra ;*/
 
@@ -299,8 +300,8 @@
  * value
  */
 #define CPTYPEIDX_RANGE_CHECK(type, pcfs, cpidx, msg)                  \
-    LOAD_SYSCALL_FAILURE(( /* ((((type *) &pcpd->cp)->cpidx) < 0) || */\
-                          ((((type *) &pcpd->cp)->cpidx) >=            \
+    LOAD_SYSCALL_FAILURE(( /* ((((type *)&pcpma->cp)->cpidx) < 0) || */\
+                          ((((type *) &pcpma->cp)->cpidx) >=           \
                                           pcfs->constant_pool_count)), \
                          msg,                                          \
                          rnull,                                        \
@@ -525,7 +526,7 @@
      * because the proper class info should be accessed instead.
      */
      pcfs->constant_pool = HEAP_GET_METHOD(pcfs->constant_pool_count *
-                                               sizeof(cp_info_dup *),
+                                            sizeof(cp_info_mem_align *),
                                            rfalse);
 
     /*
@@ -533,7 +534,7 @@
      * references (0th element)
      */
     pcfs->constant_pool[CONSTANT_CP_DEFAULT_INDEX] =
-        (cp_info_dup *) rnull;
+        (cp_info_mem_align *) rnull;
 
     /*
      * Iterate through class file's @c @b constant_pool and fill in
@@ -543,7 +544,7 @@
          cpidx < pcfs->constant_pool_count + CONSTANT_CP_START_INDEX -1;
          cpidx++)
     {
-        cp_info_dup *pcpd;
+        cp_info_mem_align *pcpma;
 
         pu2 = (u2 *) pcpbytes;
 
@@ -566,7 +567,7 @@
                                       "CP name index");
 
                 /* Initialize late binding extension */
-                PTR_THIS_CP_Class(pcpd)->LOCAL_Class_binding.clsidxJVM =
+                PTR_THIS_CP_Class(pcpma)->LOCAL_Class_binding.clsidxJVM=
                                                    jvm_class_index_null;
 
                 break;
@@ -586,19 +587,19 @@
                                       "CP class index");
 
                 /* Initialize late binding extension */
-                PTR_THIS_CP_Fieldref(pcpd)
+                PTR_THIS_CP_Fieldref(pcpma)
                   ->LOCAL_Fieldref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                PTR_THIS_CP_Fieldref(pcpd)
+                PTR_THIS_CP_Fieldref(pcpma)
                   ->LOCAL_Fieldref_binding.fluidxJVM =
                                                     jvm_field_index_bad;
 
-                PTR_THIS_CP_Fieldref(pcpd)
+                PTR_THIS_CP_Fieldref(pcpma)
                   ->LOCAL_Fieldref_binding.oiflagJVM =
                                                 rneither_true_nor_false;
 
-                PTR_THIS_CP_Fieldref(pcpd)
+                PTR_THIS_CP_Fieldref(pcpma)
                   ->LOCAL_Fieldref_binding.jvaluetypeJVM =
                                                    LOCAL_BASETYPE_ERROR;
 
@@ -624,23 +625,23 @@
                                       "CP method name and type index");
 
                 /* Initialize late binding extension */
-                PTR_THIS_CP_Methodref(pcpd)
+                PTR_THIS_CP_Methodref(pcpma)
                   ->LOCAL_Methodref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                PTR_THIS_CP_Methodref(pcpd)
+                PTR_THIS_CP_Methodref(pcpma)
                   ->LOCAL_Methodref_binding.mthidxJVM =
                                                    jvm_method_index_bad;
 
-                PTR_THIS_CP_Methodref(pcpd)
+                PTR_THIS_CP_Methodref(pcpma)
                   ->LOCAL_Methodref_binding.codeatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                PTR_THIS_CP_Methodref(pcpd)
+                PTR_THIS_CP_Methodref(pcpma)
                   ->LOCAL_Methodref_binding.excpatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                PTR_THIS_CP_Methodref(pcpd)
+                PTR_THIS_CP_Methodref(pcpma)
                   ->LOCAL_Methodref_binding.nmordJVM =
                                          jvm_native_method_ordinal_null;
 
@@ -667,23 +668,23 @@
                              "CP interface method name and type index");
 
                 /* Initialize late binding extension */
-                PTR_THIS_CP_InterfaceMethodref(pcpd)
+                PTR_THIS_CP_InterfaceMethodref(pcpma)
                   ->LOCAL_InterfaceMethodref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                PTR_THIS_CP_InterfaceMethodref(pcpd)
+                PTR_THIS_CP_InterfaceMethodref(pcpma)
                   ->LOCAL_InterfaceMethodref_binding.mthidxJVM =
                                                    jvm_method_index_bad;
 
-                PTR_THIS_CP_InterfaceMethodref(pcpd)
+                PTR_THIS_CP_InterfaceMethodref(pcpma)
                   ->LOCAL_InterfaceMethodref_binding.codeatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                PTR_THIS_CP_InterfaceMethodref(pcpd)
+                PTR_THIS_CP_InterfaceMethodref(pcpma)
                   ->LOCAL_InterfaceMethodref_binding.excpatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                PTR_THIS_CP_InterfaceMethodref(pcpd)
+                PTR_THIS_CP_InterfaceMethodref(pcpma)
                   ->LOCAL_InterfaceMethodref_binding.nmordJVM =
                                          jvm_native_method_ordinal_null;
 
@@ -732,7 +733,7 @@
                  * the unused slot.  Ignore this second slot, but
                  * make sure it does not contain garbage.
                  */
-                pcfs->constant_pool[cpidx] = pcpd;
+                pcfs->constant_pool[cpidx] = pcpma;
                 cpidx++;
 
                 break;
@@ -752,7 +753,7 @@
                  * the unused slot.  Ignore this second slot, but
                  * make sure it does not contain garbage.
                  */
-                pcfs->constant_pool[cpidx] = pcpd;
+                pcfs->constant_pool[cpidx] = pcpma;
                 cpidx++;
 
                 break;
@@ -790,7 +791,7 @@
                  * namely @c @b sizeof(info[1]), or 1 byte.
                  *
                  * The segment below copies each piece of the buffer
-                 * from @c @b *pcpbytes to @c @b *pcpd .
+                 * from @c @b *pcpbytes to @c @b *pcpma .
                  */
 
                 /* Size of structure to copy */
@@ -799,18 +800,18 @@
                                sizeof(u1);
 
                 /* Allocate heap for structure */
-                pcpd = HEAP_GET_METHOD(sizeof(u1) * CP_INFO_NUM_EMPTIES+
+                pcpma= HEAP_GET_METHOD(sizeof(u1) * CP_INFO_NUM_EMPTIES+
                                            tmplenutf + cf_item_size,
                                        rfalse);
 
                 /* Copy structure, including @b empty bytes */
-                portable_memcpy(((rbyte *)pcpd) +
+                portable_memcpy(((rbyte *)pcpma) +
                                 sizeof(u1) * CP_INFO_NUM_EMPTIES,
                                 pcpbytes,
                                 cf_item_size);
-                pcpd->empty[0] = FILL_INFO_DUP0;
-                pcpd->empty[1] = FILL_INFO_DUP1;
-                pcpd->empty[2] = FILL_INFO_DUP2;
+                pcpma->empty[0] = FILL_INFO_DUP0;
+                pcpma->empty[1] = FILL_INFO_DUP1;
+                pcpma->empty[2] = FILL_INFO_DUP2;
 
                 /*
                  * Byte swap contents of
@@ -820,7 +821,7 @@
                 CP_ITEM_SWAP_U2(CONSTANT_Utf8_info, length);
 
                 /* Copy UTF string itself (No byte reversal needed.) */
-                portable_memcpy(PTR_THIS_CP_Utf8(pcpd)->bytes,
+                portable_memcpy(PTR_THIS_CP_Utf8(pcpma)->bytes,
                                ((CONSTANT_Utf8_info *) pcpbytes)->bytes,
                                 tmplenutf);
 
@@ -856,7 +857,7 @@
         } /* switch ... */
 
         /* Point to storage area for this @c @b constant_pool[] item */
-        pcfs->constant_pool[cpidx] = pcpd;
+        pcfs->constant_pool[cpidx] = pcpma;
 
         /* Now point past this CONSTANT_Xxxxxx_info area */
         pcpbytes += cf_item_size;
@@ -1108,7 +1109,7 @@
             {
                 /* Quite possible for small objects */
                 pcfs->fields[fldidx]->attributes =
-                                          (attribute_info_dup **) rnull;
+                                    (attribute_info_mem_align **) rnull;
             }
             else
             {
@@ -1269,7 +1270,7 @@
             {
                 /* Quite possible for small objects */
                 pcfs->methods[mthidx]->attributes =
-                                          (attribute_info_dup **) rnull;
+                                    (attribute_info_mem_align **) rnull;
             }
             else
             {
@@ -1279,7 +1280,7 @@
                 pcfs->methods[mthidx]->attributes =
                     HEAP_GET_METHOD(
                         pcfs->methods[mthidx]->attributes_count *
-                            sizeof(attribute_info_dup *),
+                            sizeof(attribute_info_mem_align *),
                         rtrue);
 
                 /*
@@ -1390,7 +1391,7 @@
     if (0 == pcfs->attributes_count)
     {
         /* Not really possible, and theoretically faulty */
-        pcfs->attributes = (attribute_info_dup **) rnull;
+        pcfs->attributes = (attribute_info_mem_align **) rnull;
     }
     else
     {

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.h?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.h Thu Apr 27 18:41:46 2006
@@ -191,15 +191,13 @@
 /*@{ */ /* Begin grouped definitions */
 
 #define CP_INFO_NUM_EMPTIES 3 /**< Size of padding for cp_info
-                  * structures in size of cp_info_dup structure */
+                  * structures in size of cp_info_mem_align structure */
 
 /*!
  * @brief Pad cp_info structures for proper multi-byte field
  * address boundary alignment.
  * @see FILL_INFO_DUP0 et al.
  *
- * @todo HARMONY-6-jvm-classfile.h-9 Rename cp_info_dup to become
- * cp_info_mem_align
  */
 typedef struct
 {
@@ -211,12 +209,12 @@
                   *   all items except @p @b tag are on even addresses.
                   *   This assumes they are all u2 or u4.
                   */
-} cp_info_dup;
+} cp_info_mem_align;
 
 
 #define ATTRIBUTE_INFO_NUM_EMPTIES 2 /**< Size of padding for
                   * attribute_info structures in size of
-                  * attribute_info_dup structure */
+                  * attribute_info_mem_align structure */
 /*!
  * @brief Pad attribute_info structures for proper multi-byte field
  * address boundary alignment.
@@ -239,7 +237,7 @@
                   * alignment.
                   */
 
-} attribute_info_dup;
+} attribute_info_mem_align;
 
 /*@} */ /* End of grouped definitions */
 
@@ -267,7 +265,7 @@
 
     u2 attributes_count; /**< Size of @p @b attributes */
 
-    attribute_info_dup **attributes; /**< Field attributes array.
+    attribute_info_mem_align **attributes; /**< Field attributes array.
                        * The spec pseudo-code defines this as:
             <b><code>attributes_info fields[attributes_count]</code></b>
                        * but it is implemented as a pointer to an array
@@ -276,7 +274,7 @@
                        *
                        * Notice that the @c @b attribute_info
                        * structure is found with this
-                       * @c @b attribute_info_dup structure.
+                       * @c @b attribute_info_mem_align structure.
                        * The purpose for this is proper byte alignment
                        * of multi-byte items such as 2- and 4-byte
                        * integers on machine architectures that demand
@@ -350,7 +348,7 @@
 
     u2 attributes_count; /**< Size of @p @b attributes */
 
-    attribute_info_dup **attributes; /**< Method attributes array.
+    attribute_info_mem_align **attributes; /**< Method attributes array.
                        * The spec pseudo-code defines this as:
             <b><code>attributes_info fields[attributes_count]</code></b>
                        * but it is implemented as a pointer to an array
@@ -359,7 +357,7 @@
                        *
                        * Notice that the @c @b attribute_info
                        * structure is found with this
-                       * @c @b attribute_info_dup structure.
+                       * @c @b attribute_info_mem_align structure.
                        * The purpose for this is proper byte alignment
                        * of multi-byte items such as 2- and 4-byte
                        * integers on machine architectures that demand
@@ -472,8 +470,8 @@
                        * pointer.
                        */
 
-    cp_info_dup **constant_pool; /**< Constant pool array.  The spec
-                       * pseudo-code defines this as:
+    cp_info_mem_align **constant_pool; /**< Constant pool array.  The
+                       * spec pseudo-code defines this as:
       <b><code>cp_info constant_pool[constant_pool_count - 1]</code></b>
                        * but it is implemented as a pointer to an array
                        * of pointers.  The length of this array is 
@@ -481,7 +479,7 @@
                        * elements.
                        *
                        * Notice that the @c @b cp_info structure
-                       * is found with this @c @b cp_info_dup
+                       * is found with this @c @b cp_info_mem_align
                        * structure.  The purpose for this is proper
                        * byte alignment of multi-byte items such as
                        * 2- and 4-byte integers on machine architectures
@@ -536,8 +534,8 @@
 
     u2 attributes_count; /**< Size of @p @b attributes */
 
-    attribute_info_dup **attributes; /**< Class file attributes array.
-                       * The spec pseudo-code defines this as:
+    attribute_info_mem_align **attributes; /**< Class file attributes
+                       * array. The spec pseudo-code defines this as:
                     @c @b attributes_info @c @b fields[attributes_count]
                        * but it is implemented as a pointer to an array
                        * of pointers.  The length of this array is 
@@ -545,7 +543,7 @@
                        *
                        * Notice that the @c @b attribute_info
                        * structure is found with this
-                       * @c @b attribute_info_dup structure.
+                       * @c @b attribute_info_mem_align structure.
                        * The purpose for this is proper byte alignment
                        * of multi-byte items such as 2- and 4-byte
                        * integers on machine architectures that demand
@@ -1784,7 +1782,7 @@
                        @c @b exception_table[exception_table_length]; */
 
     u2 attributes_count;
-    attribute_info_dup **attributes; /**< Spec pseudo-code:
+    attribute_info_mem_align **attributes; /**< Spec pseudo-code:
       <b><code>attribute_info attributes[attributes_count]</code></b> */
 
 } Code_attribute;
@@ -2876,11 +2874,11 @@
 extern void cfattrib_unload_annotation(ClassFile            *pcfs,
                                        annotation_mem_align *dst);
 
-extern u1 *cfattrib_load_attribute(ClassFile           *pcfs,
-                                   attribute_info_dup **dst,
-                                   attribute_info      *src);
-extern rvoid cfattrib_unload_attribute(ClassFile          *pcfs,
-                                       attribute_info_dup *dst);
+extern u1 *cfattrib_load_attribute(ClassFile                 *pcfs,
+                                   attribute_info_mem_align **dst,
+                                   attribute_info            *src);
+extern rvoid cfattrib_unload_attribute(ClassFile                *pcfs,
+                                       attribute_info_mem_align *dst);
 
 extern classfile_attribute_enum cfattrib_atr2enum(ClassFile *pcfs,
                               u2 attribute_attribute_name_index);
@@ -2891,9 +2889,9 @@
 /* Prototypes for functions in 'cfmsgs.c' */
 extern rvoid cfmsgs_typemsg(rchar *fn, ClassFile *pcfs, u2 idx);
 extern rvoid cfmsgs_show_constant_pool(ClassFile *pcfs);
-extern rvoid cfmsgs_atrmsg(rchar *fn,
-                           ClassFile *pcfs,
-                           attribute_info_dup *atr);
+extern rvoid cfmsgs_atrmsg(rchar                    *fn,
+                           ClassFile                *pcfs,
+                           attribute_info_mem_align *atr);
 
 /*!
  * @internal Remove effects of packing pragma on other code.

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.c Thu Apr 27 18:41:46 2006
@@ -781,7 +781,7 @@
  *
  */
 
-rchar *classpath_get_from_cp_entry_utf(cp_info_dup *clsname)
+rchar *classpath_get_from_cp_entry_utf(cp_info_mem_align *clsname)
 {
     ARCH_FUNCTION_NAME(classpath_get_from_cp_entry_utf);
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.h?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classpath.h Thu Apr 27 18:41:46 2006
@@ -122,7 +122,8 @@
 
 extern rchar *classpath_get_from_prchar(rchar *clsname);
 
-extern rchar *classpath_get_from_cp_entry_utf(cp_info_dup *clsname);
+extern rchar *classpath_get_from_cp_entry_utf(
+                                            cp_info_mem_align *clsname);
 
 
 #endif /* _classpath_h_included_ */

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.c Thu Apr 27 18:41:46 2006
@@ -86,9 +86,9 @@
  *         search result.
  *
  */
-jvm_field_index field_find_by_cp_entry(jvm_class_index  clsidx,
-                                       cp_info_dup     *fldname,
-                                       cp_info_dup     *flddesc)
+jvm_field_index field_find_by_cp_entry(jvm_class_index    clsidx,
+                                       cp_info_mem_align *fldname,
+                                       cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_find_by_cp_entry);
 
@@ -195,9 +195,9 @@
  *          field, otherwise @link #rfalse rfalse@endlink.
  *
  */
-rboolean field_name_is_class_static(jvm_class_index  clsidx,
-                                    cp_info_dup     *fldname,
-                                    cp_info_dup     *flddesc)
+rboolean field_name_is_class_static(jvm_class_index    clsidx,
+                                    cp_info_mem_align *fldname,
+                                    cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_is_class_static);
 
@@ -275,9 +275,9 @@
  *          instance field, otherwise @link #rfalse rfalse@endlink.
  *
  */
-rboolean field_name_is_object_instance(jvm_class_index   clsidx,
-                                       cp_info_dup     *fldname,
-                                       cp_info_dup     *flddesc)
+rboolean field_name_is_object_instance(jvm_class_index    clsidx,
+                                       cp_info_mem_align *fldname,
+                                       cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_is_object_instance);
 
@@ -357,9 +357,9 @@
  *
  */
 jvm_field_lookup_index
-    field_name_get_class_static_lookup(jvm_class_index  clsidx,
-                                       cp_info_dup     *fldname,
-                                       cp_info_dup     *flddesc)
+    field_name_get_class_static_lookup(jvm_class_index    clsidx,
+                                       cp_info_mem_align *fldname,
+                                       cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_get_class_static_lookup);
 
@@ -442,9 +442,9 @@
  *
  */
 jvm_field_lookup_index
-    field_name_get_object_instance_lookup(jvm_class_index  clsidx,
-                                          cp_info_dup     *fldname,
-                                          cp_info_dup     *flddesc)
+    field_name_get_object_instance_lookup(jvm_class_index    clsidx,
+                                          cp_info_mem_align *fldname,
+                                          cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_get_object_instance_lookup);
 
@@ -522,9 +522,9 @@
  *          @link #rnull rnull@endlink.
  *
  */
-jvalue *field_name_get_class_static_pjvalue(jvm_class_index  clsidx,
-                                            cp_info_dup     *fldname,
-                                            cp_info_dup     *flddesc)
+jvalue *field_name_get_class_static_pjvalue(jvm_class_index    clsidx,
+                                            cp_info_mem_align *fldname,
+                                            cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_get_class_static_pjvalue);
 
@@ -599,8 +599,8 @@
  *
  */
 jvalue *field_name_get_object_instance_pjvalue(jvm_object_hash  objhash,
-                                               cp_info_dup     *fldname,
-                                               cp_info_dup     *flddesc)
+                                             cp_info_mem_align *fldname,
+                                             cp_info_mem_align *flddesc)
 {
     ARCH_FUNCTION_NAME(field_name_get_object_instance_pjvalue);
 
@@ -694,10 +694,10 @@
  *
  */
 jvm_field_index
-    field_name_put_class_static_pjvalue(jvm_class_index  clsidx,
-                                        cp_info_dup     *fldname,
-                                        cp_info_dup     *flddesc,
-                                        jvalue          *_jvalue)
+    field_name_put_class_static_pjvalue(jvm_class_index    clsidx,
+                                        cp_info_mem_align *fldname,
+                                        cp_info_mem_align *flddesc,
+                                        jvalue            *_jvalue)
 {
     ARCH_FUNCTION_NAME(field_name_put_class_static_pjvalue);
 
@@ -786,10 +786,10 @@
  *
  */
 jvm_field_index
-    field_name_put_object_instance_pjvalue(jvm_object_hash  objhash,
-                                           cp_info_dup     *fldname,
-                                           cp_info_dup     *flddesc,
-                                           jvalue          *_jvalue)
+    field_name_put_object_instance_pjvalue(jvm_object_hash    objhash,
+                                           cp_info_mem_align *fldname,
+                                           cp_info_mem_align *flddesc,
+                                           jvalue            *_jvalue)
 {
     ARCH_FUNCTION_NAME(field_name_put_object_instance_pjvalue);
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.h?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.h (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/field.h Thu Apr 27 18:41:46 2006
@@ -74,59 +74,59 @@
 
 /* Prototypes for functions in 'field.h' */
 
-extern jvm_field_index field_find_by_cp_entry(jvm_class_index  clsidx,
-                                              cp_info_dup     *fldname,
-                                              cp_info_dup     *flddesc);
+extern jvm_field_index field_find_by_cp_entry(jvm_class_index   clsidx,
+                                             cp_info_mem_align *fldname,
+                                             cp_info_mem_align *flddesc);
 
 extern rboolean field_index_is_class_static(jvm_class_index clsidx,
                                             jvm_field_index fldidx);
 
-extern rboolean field_name_is_class_static(jvm_class_index  clsidx,
-                                           cp_info_dup     *fldname,
-                                           cp_info_dup     *flddesc);
+extern rboolean field_name_is_class_static(jvm_class_index    clsidx,
+                                           cp_info_mem_align *fldname,
+                                           cp_info_mem_align *flddesc);
 
 extern rboolean field_index_is_object_instance(jvm_class_index clsidx,
                                                jvm_field_index fldidx);
 
 extern rboolean field_name_is_object_instance(jvm_class_index  clsidx,
-                                              cp_info_dup     *fldname,
-                                              cp_info_dup     *flddesc);
+                                            cp_info_mem_align *fldname,
+                                            cp_info_mem_align *flddesc);
 
 extern jvm_field_lookup_index
     field_index_get_class_static_lookup(jvm_class_index clsidx,
                                         jvm_field_index fldidx);
 
 extern jvm_field_lookup_index
-    field_name_get_class_static_lookup(jvm_class_index  clsidx,
-                                       cp_info_dup     *fldname,
-                                       cp_info_dup     *flddesc);
+    field_name_get_class_static_lookup(jvm_class_index    clsidx,
+                                       cp_info_mem_align *fldname,
+                                       cp_info_mem_align *flddesc);
 
 extern jvm_field_lookup_index
     field_index_get_object_instance_lookup(jvm_class_index clsidx,
                                            jvm_field_index fldidx);
 
 extern jvm_field_lookup_index
-    field_name_get_object_instance_lookup(jvm_class_index  clsidx,
-                                          cp_info_dup     *fldname,
-                                          cp_info_dup     *flddesc);
+    field_name_get_object_instance_lookup(jvm_class_index    clsidx,
+                                          cp_info_mem_align *fldname,
+                                          cp_info_mem_align *flddesc);
 
 extern jvalue *field_index_get_class_static_pjvalue(
                    jvm_class_index  clsidx,
                    jvm_field_index fldidx);
 
 extern jvalue *field_name_get_class_static_pjvalue(
-                   jvm_class_index  clsidx,
-                   cp_info_dup     *fldname,
-                   cp_info_dup     *flddesc);
+                   jvm_class_index    clsidx,
+                   cp_info_mem_align *fldname,
+                   cp_info_mem_align *flddesc);
 
 extern jvalue *field_index_get_object_instance_pjvalue(
                    jvm_object_hash objhash,
                    jvm_field_index fldidx);
 
 extern jvalue *field_name_get_object_instance_pjvalue(
-                   jvm_object_hash  objhash,
-                   cp_info_dup     *fldname,
-                   cp_info_dup     *flddesc);
+                   jvm_object_hash    objhash,
+                   cp_info_mem_align *fldname,
+                   cp_info_mem_align *flddesc);
 
 extern jvm_field_index field_index_put_class_static_pjvalue(
                    jvm_class_index  clsidx,
@@ -135,9 +135,9 @@
 
 extern jvm_field_index field_name_put_class_static_pjvalue(
                    jvm_class_index  clsidx,
-                   cp_info_dup     *fldname,
-                   cp_info_dup     *flddesc,
-                   jvalue          *_jvalue);
+                   cp_info_mem_align *fldname,
+                   cp_info_mem_align *flddesc,
+                   jvalue            *_jvalue);
 
 extern jvm_field_index field_index_put_object_instance_pjvalue(
                    jvm_object_hash  objhash,
@@ -145,10 +145,10 @@
                    jvalue          *_jvalue);
 
 extern jvm_field_index field_name_put_object_instance_pjvalue(
-                   jvm_object_hash  objhash,
-                   cp_info_dup     *fldname,
-                   cp_info_dup     *flddesc,
-                   jvalue          *_jvalue);
+                   jvm_object_hash    objhash,
+                   cp_info_mem_align *fldname,
+                   cp_info_mem_align *flddesc,
+                   jvalue            *_jvalue);
 
 #endif /* _field_h_included_ */
 

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvm.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvm.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvm.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/jvm.c Thu Apr 27 18:41:46 2006
@@ -1388,7 +1388,7 @@
 
     string1[0] = pjvm->argcj; /* Number of java command line parms */
 
-    cp_info_dup *pcpclsname =
+    cp_info_mem_align *pcpclsname =
         nts_prchar2utf_classname(JVMCLASS_JAVA_LANG_STRING, 1);
 
     rchar *pclsname = utf_utf2prchar(PTR_THIS_CP_Utf8(pcpclsname));
@@ -1570,7 +1570,7 @@
         rint i;
         for (i = 0; i < pjvm->argcj; i++)
         {
-            cp_info_dup *putfarg = nts_prchar2utf(pjvm->argvj[i]);
+            cp_info_mem_align *putfarg = nts_prchar2utf(pjvm->argvj[i]);
 
             /*!
              * @todo HARMONY-6-jvm-jvm.c-8 This invocation needs better

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c?rev=397712&r1=397711&r2=397712&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/linkage.c Thu Apr 27 18:41:46 2006
@@ -149,28 +149,28 @@
         jvm_method_index       mthidxFIND;
         jvm_attribute_index    atridxFIND;
 
-        cp_info_dup *pcpd = pcfs->constant_pool[cpidx];
+        cp_info_mem_align *pcpma = pcfs->constant_pool[cpidx];
 
-        CONSTANT_Class_info              *pcpd_Class;
-        CONSTANT_Fieldref_info           *pcpd_Fieldref;
-        CONSTANT_Methodref_info          *pcpd_Methodref;
-        CONSTANT_InterfaceMethodref_info *pcpd_InterfaceMethodref;
-        CONSTANT_NameAndType_info        *pcpd_NameAndType;
+        CONSTANT_Class_info              *pcpma_Class;
+        CONSTANT_Fieldref_info           *pcpma_Fieldref;
+        CONSTANT_Methodref_info          *pcpma_Methodref;
+        CONSTANT_InterfaceMethodref_info *pcpma_InterfaceMethodref;
+        CONSTANT_NameAndType_info        *pcpma_NameAndType;
 
-        cp_info_dup *clsname;
+        cp_info_mem_align *clsname;
 
         switch (CP_TAG(pcfs, cpidx))
         {
             case CONSTANT_Class:
 
-                pcpd_Class = PTR_THIS_CP_Class(pcpd);
+                pcpma_Class = PTR_THIS_CP_Class(pcpma);
 
                 /* Only resolve this CP slot if it is not yet done. */
                 if (jvm_class_index_null ==
-                    pcpd_Class->LOCAL_Class_binding.clsidxJVM)
+                    pcpma_Class->LOCAL_Class_binding.clsidxJVM)
                 {
                     clsname =
-                        pcfs->constant_pool[pcpd_Class->name_index];
+                        pcfs->constant_pool[pcpma_Class->name_index];
 
                     clsidxFIND = class_find_by_cp_entry(clsname);
 
@@ -181,7 +181,7 @@
                     }
                     else
                     {
-                        PTR_THIS_CP_Class(pcpd)
+                        PTR_THIS_CP_Class(pcpma)
                           ->LOCAL_Class_binding.clsidxJVM = clsidxFIND;
 
                         /* Add reference unless it references itself */
@@ -197,22 +197,22 @@
 
             case CONSTANT_Fieldref:
 
-                pcpd_Fieldref = PTR_THIS_CP_Fieldref(pcpd);
+                pcpma_Fieldref = PTR_THIS_CP_Fieldref(pcpma);
 
                 /* Only resolve this CP slot if it is not yet done. */
                 if (jvm_class_index_null ==
-                    pcpd_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
+                    pcpma_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
                 {
-                    pcpd_Class =
+                    pcpma_Class =
                         PTR_THIS_CP_Class(pcfs->constant_pool
-                                         [pcpd_Fieldref->class_index]);
+                                         [pcpma_Fieldref->class_index]);
 
                     clsname =
-                        pcfs->constant_pool[pcpd_Class->name_index];
+                        pcfs->constant_pool[pcpma_Class->name_index];
 
                     clsidxFIND = class_find_by_cp_entry(clsname);
 
-                    pcpd_Fieldref
+                    pcpma_Fieldref
                       ->LOCAL_Fieldref_binding.clsidxJVM = clsidxFIND;
 
                     if (jvm_class_index_null == clsidxFIND)
@@ -230,20 +230,20 @@
                          */
                         while(rtrue)
                         {
-                            pcpd_NameAndType =
+                            pcpma_NameAndType =
                                 PTR_THIS_CP_NameAndType(
                                     pcfs->constant_pool
-                                      [pcpd_Fieldref
+                                      [pcpma_Fieldref
                                          ->name_and_type_index]);
 
                             fldidxFIND =
                                 field_find_by_cp_entry(
                                     clsidxFIND,
                                     pcfs->constant_pool
-                                            [pcpd_NameAndType
+                                            [pcpma_NameAndType
                                                ->name_index],
                                     pcfs->constant_pool
-                                            [pcpd_NameAndType
+                                            [pcpma_NameAndType
                                                ->descriptor_index]);
 
                             /* Done if field located */
@@ -258,7 +258,7 @@
                                   ->pcfs
                                     ->super_class;
 
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.clsidxJVM =
                                 clsidxFIND;
 
@@ -276,15 +276,15 @@
                                    JVMCLASS_JAVA_LANG_NOSUCHFIELDERROR);
 /*NOTREACHED*/
 #if 0
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.fluidxJVM =
                                              jvm_field_lookup_index_bad;
 
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.oiflagJVM =
                                                 rneither_true_nor_false;
 
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.jvaluetypeJVM =
                                                    LOCAL_BASETYPE_ERROR;
 
@@ -311,7 +311,7 @@
 
                         }
 
-                        pcpd_Fieldref
+                        pcpma_Fieldref
                           ->LOCAL_Fieldref_binding.fluidxJVM =
                                                              fluidxFIND;
 
@@ -322,11 +322,11 @@
                                    JVMCLASS_JAVA_LANG_NOSUCHFIELDERROR);
 /*NOTREACHED*/
 #if 0
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.oiflagJVM =
                                                 rneither_true_nor_false;
 
-                            pcpd_Fieldref
+                            pcpma_Fieldref
                               ->LOCAL_Fieldref_binding.jvaluetypeJVM =
                                                    LOCAL_BASETYPE_ERROR;
 
@@ -338,14 +338,14 @@
 #endif
                         }
 
-                        pcpd_Fieldref
+                        pcpma_Fieldref
                           ->LOCAL_Fieldref_binding.oiflagJVM =
                                 (FIELD(clsidxFIND, fldidxFIND)
                                    ->access_flags & ACC_STATIC)
                                 ? rfalse
                                 : rtrue;
 
-                        cp_info_dup *pfldesc_dup =
+                        cp_info_mem_align *pfldesc_mem_align =
                            CLASS_OBJECT_LINKAGE(clsidxFIND)
                              ->pcfs
                                ->constant_pool
@@ -353,7 +353,7 @@
                                     ->descriptor_index];
 
                         CONSTANT_Utf8_info *pfldesc =
-                                          PTR_THIS_CP_Utf8(pfldesc_dup);
+                                    PTR_THIS_CP_Utf8(pfldesc_mem_align);
 
                         /*!
                          * @todo HARMONY-6-jvm-linkage.c-1 What needs
@@ -361,7 +361,7 @@
                          *       BASETYPE_ARRAY or BASETYPE_ERROR
                          *       or BASETYPE_VOID?
                          */
-                        pcpd_Fieldref
+                        pcpma_Fieldref
                           ->LOCAL_Fieldref_binding.jvaluetypeJVM =
                                                       pfldesc->bytes[0];
 
@@ -378,24 +378,24 @@
 
             case CONSTANT_Methodref:
 
-                pcpd_Methodref = PTR_THIS_CP_Methodref(pcpd);
+                pcpma_Methodref = PTR_THIS_CP_Methodref(pcpma);
 
                 /* Only resolve this CP slot if it is not yet done. */
                 if (jvm_class_index_null ==
-                    pcpd_Methodref->LOCAL_Methodref_binding.clsidxJVM)
+                    pcpma_Methodref->LOCAL_Methodref_binding.clsidxJVM)
                 {
-                    pcpd_Class =
+                    pcpma_Class =
                         PTR_THIS_CP_Class(
                             pcfs
                               ->constant_pool
-                                [pcpd_Methodref->class_index]);
+                                [pcpma_Methodref->class_index]);
 
                     clsname =
-                        pcfs->constant_pool[pcpd_Class->name_index];
+                        pcfs->constant_pool[pcpma_Class->name_index];
 
                     clsidxFIND = class_find_by_cp_entry(clsname);
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.clsidxJVM = clsidxFIND;
 
                     if (jvm_class_index_null == clsidxFIND)
@@ -413,11 +413,11 @@
                          */
                         while(rtrue)
                         {
-                            pcpd_NameAndType =
+                            pcpma_NameAndType =
                                 PTR_THIS_CP_NameAndType(
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_Methodref
+                                        [pcpma_Methodref
                                            ->name_and_type_index]);
 
                             mthidxFIND =
@@ -425,13 +425,13 @@
                                     clsidxFIND,
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_NameAndType->name_index],
+                                        [pcpma_NameAndType->name_index],
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_NameAndType
+                                        [pcpma_NameAndType
                                            ->descriptor_index]);
 
-                            pcpd_Methodref
+                            pcpma_Methodref
                               ->LOCAL_Methodref_binding.mthidxJVM =
                                                              mthidxFIND;
 
@@ -447,7 +447,7 @@
                                   ->pcfs
                                     ->super_class;
 
-                            pcpd_Methodref
+                            pcpma_Methodref
                               ->LOCAL_Methodref_binding.clsidxJVM =
                                                              clsidxFIND;
 
@@ -477,14 +477,14 @@
                         {
                             atridxFIND = jvm_attribute_index_native;
 
-                            pcpd_Methodref
+                            pcpma_Methodref
                               ->LOCAL_Methodref_binding
                                 .nmordJVM =
                                     native_locate_local_method(
                                             pcfs,
-                                            pcpd_Class->name_index,
-                                           pcpd_NameAndType->name_index,
-                                            pcpd_NameAndType
+                                            pcpma_Class->name_index,
+                                          pcpma_NameAndType->name_index,
+                                            pcpma_NameAndType
                                               ->descriptor_index,
                                             find_registerNatives);
                         }
@@ -497,7 +497,7 @@
                                     LOCAL_CODE_ATTRIBUTE);
                         }
 
-                        pcpd_Methodref
+                        pcpma_Methodref
                           ->LOCAL_Methodref_binding.codeatridxJVM =
                                                              atridxFIND;
 
@@ -520,7 +520,7 @@
                                 mthidxFIND,
                                 LOCAL_EXCEPTIONS_ATTRIBUTE);
 
-                        pcpd_Methodref
+                        pcpma_Methodref
                           ->LOCAL_Methodref_binding.excpatridxJVM =
                                                              atridxFIND;
 
@@ -542,23 +542,23 @@
 
             case CONSTANT_InterfaceMethodref:
 
-                pcpd_InterfaceMethodref =
-                    PTR_THIS_CP_InterfaceMethodref(pcpd);
+                pcpma_InterfaceMethodref =
+                    PTR_THIS_CP_InterfaceMethodref(pcpma);
 
                 /* Only resolve this CP slot if it is not yet done. */
                 if (jvm_class_index_null ==
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.clsidxJVM)
                 {
-                    pcpd_Class =
+                    pcpma_Class =
                         PTR_THIS_CP_Class(pcfs->constant_pool
-                                [pcpd_InterfaceMethodref->class_index]);
+                               [pcpma_InterfaceMethodref->class_index]);
                     clsname =
-                        pcfs->constant_pool[pcpd_Class->name_index];
+                        pcfs->constant_pool[pcpma_Class->name_index];
 
                     clsidxFIND = class_find_by_cp_entry(clsname);
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.clsidxJVM =
                                                              clsidxFIND;
 
@@ -577,11 +577,11 @@
                          */
                         while(rtrue)
                         {
-                            pcpd_NameAndType =
+                            pcpma_NameAndType =
                                 PTR_THIS_CP_NameAndType(
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_InterfaceMethodref
+                                        [pcpma_InterfaceMethodref
                                            ->name_and_type_index]);
 
                             mthidxFIND =
@@ -589,13 +589,13 @@
                                     clsidxFIND,
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_NameAndType->name_index],
+                                        [pcpma_NameAndType->name_index],
                                     pcfs
                                       ->constant_pool
-                                        [pcpd_NameAndType
+                                        [pcpma_NameAndType
                                            ->descriptor_index]);
 
-                            pcpd_InterfaceMethodref
+                            pcpma_InterfaceMethodref
                               ->LOCAL_InterfaceMethodref_binding
                                 .mthidxJVM =
                                     mthidxFIND;
@@ -612,7 +612,7 @@
                                   ->pcfs
                                     ->super_class;
 
-                            pcpd_InterfaceMethodref
+                            pcpma_InterfaceMethodref
                               ->LOCAL_InterfaceMethodref_binding
                                 .clsidxJVM =
                                     clsidxFIND;
@@ -654,14 +654,14 @@
                              *       @link #rfalse rfalse@endlink
                              *       instead?
                              */
-                            pcpd_InterfaceMethodref
+                            pcpma_InterfaceMethodref
                               ->LOCAL_InterfaceMethodref_binding
                                 .nmordJVM =
                                     native_locate_local_method(
                                             pcfs,
-                                            pcpd_Class->name_index,
-                                           pcpd_NameAndType->name_index,
-                                            pcpd_NameAndType
+                                            pcpma_Class->name_index,
+                                          pcpma_NameAndType->name_index,
+                                            pcpma_NameAndType
                                               ->descriptor_index,
                                             find_registerNatives);
                         }
@@ -674,7 +674,7 @@
                                     LOCAL_CODE_ATTRIBUTE);
                         }
 
-                        pcpd_InterfaceMethodref
+                        pcpma_InterfaceMethodref
                           ->LOCAL_InterfaceMethodref_binding
                             .codeatridxJVM =
                                 atridxFIND;
@@ -698,7 +698,7 @@
                                 mthidxFIND,
                                 LOCAL_EXCEPTIONS_ATTRIBUTE);
 
-                        pcpd_InterfaceMethodref
+                        pcpma_InterfaceMethodref
                           ->LOCAL_InterfaceMethodref_binding
                             .excpatridxJVM =
                                 atridxFIND;
@@ -812,71 +812,71 @@
          cpidx < pcfs->constant_pool_count + CONSTANT_CP_START_INDEX -1;
          cpidx++)
     {
-        cp_info_dup *pcpd = pcfs->constant_pool[cpidx];
+        cp_info_mem_align *pcpma = pcfs->constant_pool[cpidx];
 
-        CONSTANT_Class_info              *pcpd_Class;
-        CONSTANT_Fieldref_info           *pcpd_Fieldref;
-        CONSTANT_Methodref_info          *pcpd_Methodref;
-        CONSTANT_InterfaceMethodref_info *pcpd_InterfaceMethodref;
+        CONSTANT_Class_info              *pcpma_Class;
+        CONSTANT_Fieldref_info           *pcpma_Fieldref;
+        CONSTANT_Methodref_info          *pcpma_Methodref;
+        CONSTANT_InterfaceMethodref_info *pcpma_InterfaceMethodref;
 
         switch (CP_TAG(pcfs, cpidx))
         {
             case CONSTANT_Class:
 
-                pcpd_Class = PTR_THIS_CP_Class(pcpd);
+                pcpma_Class = PTR_THIS_CP_Class(pcpma);
 
                 /* Only unresolve this CP slot if it was resolved */
                 if (jvm_class_index_null !=
-                    pcpd_Class->LOCAL_Class_binding.clsidxJVM)
+                    pcpma_Class->LOCAL_Class_binding.clsidxJVM)
                 {
                     /* Remove reference unless it references itself */
                     if (clsidx !=
-                        pcpd_Class->LOCAL_Class_binding.clsidxJVM)
+                        pcpma_Class->LOCAL_Class_binding.clsidxJVM)
                     {
                         (rvoid) GC_CLASS_RMREF_FROM_CLASS(
                                     clsidx,
-                                    pcpd_Class
+                                    pcpma_Class
                                       ->LOCAL_Class_binding
                                         .clsidxJVM);
                     }
 
-                    pcpd_Class->LOCAL_Class_binding.clsidxJVM =
+                    pcpma_Class->LOCAL_Class_binding.clsidxJVM =
                         jvm_class_index_null;
                 }
                 break;
 
             case CONSTANT_Fieldref:
 
-                pcpd_Fieldref = PTR_THIS_CP_Fieldref(pcpd);
+                pcpma_Fieldref = PTR_THIS_CP_Fieldref(pcpma);
 
                 /* Only unresolve this CP slot if it was resolved */
                 if (jvm_class_index_null !=
-                    pcpd_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
+                    pcpma_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
                 {
                     /* Remove reference unless it references itself */
                     if (clsidx != 
-                        pcpd_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
+                       pcpma_Fieldref->LOCAL_Fieldref_binding.clsidxJVM)
                     {
                         (rvoid) GC_CLASS_RMREF_FROM_CLASS(
                                     clsidx,
-                                    pcpd_Fieldref
+                                    pcpma_Fieldref
                                       ->LOCAL_Fieldref_binding
                                         .clsidxJVM);
                     }
 
-                    pcpd_Fieldref
+                    pcpma_Fieldref
                       ->LOCAL_Fieldref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                    pcpd_Fieldref
+                    pcpma_Fieldref
                       ->LOCAL_Fieldref_binding.fluidxJVM =
                                              jvm_field_lookup_index_bad;
 
-                    pcpd_Fieldref
+                    pcpma_Fieldref
                       ->LOCAL_Fieldref_binding.oiflagJVM =
                                                 rneither_true_nor_false;
 
-                    pcpd_Fieldref
+                    pcpma_Fieldref
                       ->LOCAL_Fieldref_binding.jvaluetypeJVM =
                                                    LOCAL_BASETYPE_ERROR;
                 }
@@ -884,40 +884,40 @@
 
             case CONSTANT_Methodref:
 
-                pcpd_Methodref = PTR_THIS_CP_Methodref(pcpd);
+                pcpma_Methodref = PTR_THIS_CP_Methodref(pcpma);
 
                 /* Only unresolve this CP slot if it was resolved */
                 if (jvm_class_index_null !=
-                    pcpd_Methodref->LOCAL_Methodref_binding.clsidxJVM)
+                    pcpma_Methodref->LOCAL_Methodref_binding.clsidxJVM)
                 {
                     /* Remove reference unless it references itself */
                     if (clsidx != 
-                      pcpd_Methodref->LOCAL_Methodref_binding.clsidxJVM)
+                     pcpma_Methodref->LOCAL_Methodref_binding.clsidxJVM)
                     {
                         (rvoid) GC_CLASS_RMREF_FROM_CLASS(
                                     clsidx,
-                                    pcpd_Methodref
+                                    pcpma_Methodref
                                       ->LOCAL_Methodref_binding
                                         .clsidxJVM);
                     }
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.mthidxJVM =
                                                    jvm_method_index_bad;
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.codeatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.excpatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                    pcpd_Methodref
+                    pcpma_Methodref
                       ->LOCAL_Methodref_binding.nmordJVM =
                                          jvm_native_method_ordinal_null;
                 }
@@ -925,43 +925,43 @@
 
             case CONSTANT_InterfaceMethodref:
 
-                pcpd_InterfaceMethodref =
-                    PTR_THIS_CP_InterfaceMethodref(pcpd);
+                pcpma_InterfaceMethodref =
+                    PTR_THIS_CP_InterfaceMethodref(pcpma);
 
                 /* Only unresolve this CP slot if it was resolved */
                 if (jvm_class_index_null !=
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.clsidxJVM)
                 {
                     /* Remove reference unless it references itself */
                     if (clsidx != 
-                        pcpd_InterfaceMethodref
+                        pcpma_InterfaceMethodref
                           ->LOCAL_InterfaceMethodref_binding.clsidxJVM)
                     {
                         (rvoid) GC_CLASS_RMREF_FROM_CLASS(
                                     clsidx,
-                                    pcpd_InterfaceMethodref
+                                    pcpma_InterfaceMethodref
                                       ->LOCAL_InterfaceMethodref_binding
                                         .clsidxJVM);
                     }
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.clsidxJVM =
                                                    jvm_class_index_null;
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.mthidxJVM =
                                                    jvm_method_index_bad;
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.codeatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.excpatridxJVM =
                                                 jvm_attribute_index_bad;
 
-                    pcpd_InterfaceMethodref
+                    pcpma_InterfaceMethodref
                       ->LOCAL_InterfaceMethodref_binding.nmordJVM =
                                          jvm_native_method_ordinal_null;
                 }



Mime
View raw message