harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r572319 - /harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h
Date Mon, 03 Sep 2007 13:22:41 GMT
Author: dlydick
Date: Mon Sep  3 06:22:41 2007
New Revision: 572319

URL: http://svn.apache.org/viewvc?rev=572319&view=rev
Log:
Corrected incorrect use of 'jvm_field_index' in
favor of 'jvm_field_lookup_index'.

Changed CODE_DEFAULT_CATCH_TYPE from absolute 0
to 'jvm_class_index_null' since it is a class
index which is represented.

Modified:
    harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h

Modified: harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h?rev=572319&r1=572318&r2=572319&view=diff
==============================================================================
--- harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h (original)
+++ harmony/enhanced/sandbox/bootjvm/bootJVM/jvm/src/classfile.h Mon Sep  3 06:22:41 2007
@@ -297,7 +297,7 @@
      */
     struct LOCAL_field_binding
     {
-        jvm_field_index fluidxJVM; /**< JVM class table field
+        jvm_field_lookup_index fluidxJVM; /**< JVM class table field
                        * lookup index of this field.  If this is a
                        * class static field, use this value to index
                        * the @link #rclass.class_static_field_lookup
@@ -884,8 +884,7 @@
         jvm_class_index clsidxJVM;   /**< JVM class table index of
                                           this class */
 
-#warning Confusion between field index and field lookup index.
-        jvm_field_index fluidxJVM;   /**< JVM class table field lookup
+   jvm_field_lookup_index fluidxJVM; /**< JVM class table field lookup
                                         index of this field */
 
         rboolean        oiflagJVM;   /**< JVM class table flag: class
@@ -1824,8 +1823,25 @@
 
 #define         LOCAL_EXCEPTIONS_ATTRIBUTE_ENUM 3 /**< Not in spec */
 
-#define CODE_DEFAULT_CATCH_TYPE                 0 /**<  This handler is
-                                                   for all exceptions */
+
+/*                              jvm_class_index_null */
+/*                              JVMCFG_NULL_CLASS    */
+#define CODE_DEFAULT_CATCH_TYPE jvm_class_index_null \
+                          /**<  This handler is for all exceptions.
+                           *    Need to choose between using
+                           *    @link #JVMCFG_NULL_CLASS
+                                      JVMCFG_NULL_CLASS@endlink and
+                           *    @link #jvm_class_index_null
+                                      jvm_class_index_null@endlink for
+                           *    this macro.  The idea is to have a
+                           *    NULL definition of some sort.  If the
+                           *    macro is chosen, then surround the
+                           *    reference to
+                           *    @link jvm/src/jvmcfg.h jvmcfg.h@endlink
+                           *    with the selection mechanism
+                           *    @b I_AM_JVMCFG_C and so release the
+                           *    normally suppressed definition for use.
+                           */
 
 /*@} */ /* End of grouped definitions */
 



Mime
View raw message