harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r406482 - /incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c
Date Mon, 15 May 2006 00:49:54 GMT
Author: dlydick
Date: Sun May 14 17:49:54 2006
New Revision: 406482

URL: http://svn.apache.org/viewcvs?rev=406482&view=rev
Log:
Changed FILL_INFO_DUP[012] defines to new naming
method FILL_INFO_MEM_ALIGN[012] to be consistent
with the code changes.

Use (const) variable in place of define for constant pool index
in null superclass.

Use (const) variable in place of define for bad method index.

Use (const) variable in place of define for bad field index.

Use (const) variable in place of define for bad attribute index.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/classfile.c

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=406482&r1=406481&r2=406482&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
Sun May 14 17:49:54 2006
@@ -179,7 +179,9 @@
                              * @todo  HARMONY-6-jvm-classfile.c-5 Is
                              *         this assumption valid/meaningful?
                              */
-    pcfs->super_class = 0;  /* No superclass, imply java.lang.Object */
+
+                            /* No superclass, imply java.lang.Object */
+    pcfs->super_class = jvm_constant_pool_index_null;
 
     pcfs->interfaces_count = 0;
     pcfs->interfaces = (u2 *) rnull;
@@ -229,9 +231,9 @@
     pcpma = HEAP_GET_METHOD(misc_adj + sizeof(spec_typedef), rfalse);  \
     portable_memcpy(((rbyte *)pcpma) + misc_adj,pcpbytes,cf_item_size);\
                                                                        \
-    pcpma->empty[0] = FILL_INFO_DUP0;                                  \
-    pcpma->empty[1] = FILL_INFO_DUP1;                                  \
-    pcpma->empty[2] = FILL_INFO_DUP2; /* Extra ; */
+    pcpma->empty[0] = FILL_INFO_MEM_ALIGN0;                            \
+    pcpma->empty[1] = FILL_INFO_MEM_ALIGN1;                            \
+    pcpma->empty[2] = FILL_INFO_MEM_ALIGN2; /* Extra ; */
 
 
 /*!
@@ -533,7 +535,7 @@
      * Dummy entry for @c @b java.lang.Object constant pool
      * references (0th element)
      */
-    pcfs->constant_pool[CONSTANT_CP_DEFAULT_INDEX] =
+    pcfs->constant_pool[jvm_constant_pool_index_null] =
         (cp_info_mem_align *) rnull;
 
     /*
@@ -809,9 +811,9 @@
                                 sizeof(u1) * CP_INFO_NUM_EMPTIES,
                                 pcpbytes,
                                 cf_item_size);
-                pcpma->empty[0] = FILL_INFO_DUP0;
-                pcpma->empty[1] = FILL_INFO_DUP1;
-                pcpma->empty[2] = FILL_INFO_DUP2;
+                pcpma->empty[0] = FILL_INFO_MEM_ALIGN0;
+                pcpma->empty[1] = FILL_INFO_MEM_ALIGN1;
+                pcpma->empty[2] = FILL_INFO_MEM_ALIGN2;
 
                 /*
                  * Byte swap contents of
@@ -1483,7 +1485,8 @@
     if ((0 < pcfs->attributes_count) && (rnull != pcfs->attributes))
     {
         for (atridx = pcfs->attributes_count - 1;
-             atridx != JVMCFG_BAD_ATTRIBUTE; /* wrap-around when done */
+                                             /* wrap-around when done */
+             atridx != jvm_attribute_index_bad;
              atridx--)
         {
             /*
@@ -1503,7 +1506,7 @@
     if ((0 < pcfs->methods_count) && (rnull != pcfs->methods))
     {
         for (mthidx = pcfs->methods_count - 1;
-             mthidx != JVMCFG_BAD_METHOD; /* wrap-around when done */
+             mthidx != jvm_method_index_bad; /* wrap-around when done */
              mthidx--)
         {
             /*
@@ -1519,7 +1522,7 @@
             {
                 for (atridx = pcfs->methods[mthidx]->attributes_count-1;
                                              /* wrap-around when done */
-                     atridx != JVMCFG_BAD_ATTRIBUTE;
+                     atridx != jvm_attribute_index_bad;
                      atridx--)
                 {
                     /*
@@ -1546,7 +1549,7 @@
     if ((0 < pcfs->fields_count) && (rnull != pcfs->fields))
     {
         for (fldidx = pcfs->fields_count - 1;
-             fldidx != JVMCFG_BAD_FIELD; /* wrap-around when done */
+             fldidx != jvm_field_index_bad; /* wrap-around when done */
              fldidx--)
         {
             /*
@@ -1562,7 +1565,7 @@
             {
                 for (atridx = pcfs->fields[fldidx]->attributes_count -1;
                                              /* wrap-around when done */
-                     atridx != JVMCFG_BAD_ATTRIBUTE;
+                     atridx != jvm_attribute_index_bad;
                      atridx--)
                 {
                     /*
@@ -1589,7 +1592,7 @@
     if ((0 < pcfs->constant_pool_count)&&(rnull != pcfs->constant_pool))
     {
         for (cpidx = pcfs->constant_pool_count - 1;
-             cpidx > CONSTANT_CP_DEFAULT_INDEX;
+             cpidx > jvm_constant_pool_index_null;
              cpidx--)
         {
             /*



Mime
View raw message