harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r503779 - in /harmony/enhanced/drlvm/trunk/vm/vmcore/src: class_support/ verifier/
Date Mon, 05 Feb 2007 17:16:01 GMT
Author: gshimansky
Date: Mon Feb  5 09:16:00 2007
New Revision: 503779

URL: http://svn.apache.org/viewvc?view=rev&rev=503779
Log:
Applied HARMONY-2825 and HARMONY-2826 - spelling correction in comments and messages.


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Graph.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_real.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/C_Interface.cpp Mon Feb  5 09:16:00
2007
@@ -1833,7 +1833,7 @@
                                            unsigned UNREF idx)
 {
     assert(mh);
-    // Alwyas NULL for Java.
+    // Always NULL for Java.
     return 0;
 } //method_vars_get_type_info
 
@@ -2461,7 +2461,7 @@
     compile_do_compilation_jit((Method*) method, (JIT*) jit);
 } // vm_recompile_method
 
-// Called by JIT during compialtion to have the VM synchronously request a JIT (maybe another
one)
+// Called by JIT during compilation to have the VM synchronously request a JIT (maybe another
one)
 // to compile another method.
 JIT_Result vm_compile_method(JIT_Handle jit, Method_Handle method)
 {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Class_File_Loader.cpp Mon Feb
 5 09:16:00 2007
@@ -597,7 +597,7 @@
     //
     // Look up the name_index and descriptor_index
     // utf8 string const pool entries.
-    // See specification 4.6 about name_index and desctiptor_index.
+    // See specification 4.6 about name_index and descriptor_index.
     //
     if(!valid_cpi(clss, name_index, CONSTANT_Utf8, "for member name"))
         return false;
@@ -923,7 +923,7 @@
                         }
                     }//switch
                 }//else for static field
-            }//case ATTR_ConstanValue
+            }//case ATTR_ConstantValue
             break;
 
         case ATTR_Synthetic:
@@ -1183,7 +1183,7 @@
         if(!cfs.parse_u2_be(&index)) {
             REPORT_FAILED_CLASS_CLASS(_class->get_class_loader(), _class, "java/lang/ClassFormatError",
                 _class->get_name()->bytes << ": could not parse exception class
index "
-                << "while parsing excpetions for method "
+                << "while parsing exceptions for method "
                 << _name->bytes << _descriptor->bytes);
             return false;
         }
@@ -1198,7 +1198,7 @@
     if (attr_len != _n_exceptions * sizeof(uint16) + sizeof(_n_exceptions) ) {
         REPORT_FAILED_CLASS_CLASS(_class->get_class_loader(), _class, "java/lang/ClassFormatError",
             _class->get_name()->bytes << ": invalid Exceptions attribute length
"
-            << "while parsing excpetions for method "
+            << "while parsing exceptions for method "
             << _name->bytes << _descriptor->bytes);
         return false;
     }
@@ -1614,7 +1614,7 @@
     }
 
     // we should remember this point to return here
-    // after comlete LVT and LVTT parsing.
+    // after complete LVT and LVTT parsing.
     int return_point = cfs.get_offset();
     
     if(num_lvt_entries == 0 && num_lvtt_entries != 0) {
@@ -2114,7 +2114,7 @@
     //
     // there must be no more than 1 code attribute and no more than 1 exceptions
     // attribute per method
-    // See specificaton 4.8.3 and 4.8.4 first paragraphs.
+    // See specification 4.8.3 and 4.8.4 first paragraphs.
     //
 
 
@@ -2304,7 +2304,7 @@
         }
         return check_field_name(name, id_len, false);
     }
-    return false; //unreacheable code
+    return false; //unreachable code
 }
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Environment.cpp Mon Feb  5 09:16:00
2007
@@ -255,7 +255,7 @@
     // Unload all system native libraries.
     natives_cleanup();
 
-    // Unload GC-releated resources.
+    // Unload GC-related resources.
     gc_wrapup();
 
     delete GlobalCodeMemoryManager;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Initialize.cpp Mon Feb  5 09:16:00
2007
@@ -134,10 +134,10 @@
     jthrowable p_error_object;
 
     assert(!hythread_is_suspend_enabled());
-    // it's a safe poin so enviroment should be protected
+    // it's a safe point so environment should be protected
     vm_execute_java_method_array((jmethodID) meth, 0, 0);
 
-    // suspend can be enabeled in safe enviroment
+    // suspend can be enabled in safe environment
     tmn_suspend_enable();
     p_error_object = exn_get();
     tmn_suspend_disable();

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/Prepare.cpp Mon Feb  5 09:16:00
2007
@@ -787,10 +787,10 @@
                         {
                             off   = m->get_offset();
                             index = m->get_index();
-                            // mark superclass' method "m" as being overwridden
+                            // mark superclass' method "m" as being overridden
                             m->method_was_overridden();
 
-                            // notify interested JITs that "m" was overwridden by "method"
+                            // notify interested JITs that "m" was overridden by "method"
                             m->do_jit_overridden_method_callbacks(&method);
                         }
                         break;
@@ -1237,7 +1237,7 @@
     assert((((POINTER_SIZE_INT)(m_static_data_block)) % 8) == 0);
 
     //
-    // STEP 9 ::: For INTERFACES intialize static fields and return.
+    // STEP 9 ::: For INTERFACES initialize static fields and return.
     //
     if(is_interface()) {
         bool init_fields = initialize_static_fields_for_interface();
@@ -1330,7 +1330,7 @@
     //
     // STEP 15 ::: HANDLE JAVA CLASS CLASS separately
     //
-    // Make sure noone hasn't prematurely set these fields since all calculations
+    // Make sure no one hasn't prematurely set these fields since all calculations
     // up to this point should be based on clss->unpadded_instance_data_size.
     assert(m_instance_data_size == 0);
     assert(m_allocated_size == 0);
@@ -1410,7 +1410,7 @@
         if(m_alignment != GC_OBJECT_ALIGNMENT) { 
             // The GC will align on 4 byte boundaries by default on IA32....
 #ifdef POINTER64
-            ASSERT(0, "Allignment is supposed to be appropriate");
+            ASSERT(0, "Alignment is supposed to be appropriate");
 #endif
             // Make sure it is a legal mask.
             assert((m_alignment & CL_PROP_ALIGNMENT_MASK) <= CL_PROP_ALIGNMENT_MASK);
@@ -1451,7 +1451,7 @@
     //
     // STEP 20 ::: ASSIGN VALUE to static final fields
     //
-    // Generally speaking final value is inlined, so we wooldn't need to worry
+    // Generally speaking final value is inlined, so we wouldnÂ’t need to worry
     // about the initialization of those static final fields. But when we use
     // reflection mechanisms - Field.getXXX() - to access them, we got
     // null values. Considering this, we must initialize those static

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/class_impl.cpp Mon Feb  5 09:16:00
2007
@@ -449,7 +449,7 @@
     assert( hmethod );
     Method *method = (Method*)hmethod;
     return method->is_protected();
-} // method_is_proctected
+} // method_is_protected
 
 /**
  * Function returns number of method exception handlers.
@@ -594,6 +594,6 @@
     assert( hfield );
     Field *field = (Field*)hfield;
     return field->is_protected();
-} // field_is_proctected
+} // field_is_protected
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/classloader.cpp Mon Feb  5 09:16:00
2007
@@ -789,7 +789,7 @@
     // make sure it is array name
     assert(className && className[0] == '[');
 
-    // count number of dimentions in requested array
+    // count number of dimensions in requested array
     unsigned n_dimensions = 1;
     while(className[n_dimensions] == '[') n_dimensions++;
 
@@ -1132,7 +1132,7 @@
         }
     }
 
-    // check existance of a given path
+    // check existence of a given path
     apr_finfo_t finfo;
     if(apr_stat(&finfo, new_path->bytes, APR_FINFO_SIZE, tmp_pool) != APR_SUCCESS)
{
         // broken path to the file
@@ -1341,7 +1341,7 @@
      *  generated there to set vm.boot.class.path since we didn't do
      *  it before.  We need  to add on the kernel.jar 
      *  and magics support jars (if any).
-     *  note that parse_arguments.cpp defers any override, postpend or 
+     *  note that parse_arguments.cpp defers any override, append or 
      *  prepend here, storing everything as properties.
      */
      
@@ -1475,7 +1475,7 @@
     if (klass) {
         LMAutoUnlock aulock(&m_lock);
 
-        // check if class has been alredy recorded as initiated by DefineClass()
+        // check if class has been already recorded as initiated by DefineClass()
         Class** pklass = m_initiatedClasses->Lookup(className);
         if (NULL == pklass) {
             m_initiatedClasses->Insert(className, klass);
@@ -1728,7 +1728,7 @@
                 class_name, &not_found);
         }
 
-        // chech if a given class is found
+        // check if a given class is found
         if(!not_found) {
             return clss;
         }
@@ -1754,7 +1754,7 @@
     char* full_name = apr_pstrcat(local_pool, dir_name->bytes,
         PORT_FILE_SEPARATOR_STR, class_name_in_fs, NULL );
 
-    // check file existance
+    // check file existence
     apr_finfo_t finfo;
     if(apr_stat(&finfo, full_name, APR_FINFO_SIZE, local_pool) != APR_SUCCESS) {
         // file does not exist

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp Mon Feb  5
09:16:00 2007
@@ -285,7 +285,7 @@
         // We failed to acquire the lock.  Use slow linear search.
         // The linear search is safe even is someone else is adding a method
         // because of the way the table is modified:
-        // 1. If neecssary, the table is reallocated.  This operation is
+        // 1. If necessary, the table is reallocated.  This operation is
         //    atomic, so we never see a partially initialized table.
         // 2. Space is made for the new method by shifting all methods
         //    with higher addresses by 1.  The shift is done from the right,

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Graph.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Graph.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Graph.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Graph.cpp Mon Feb  5 09:16:00 2007
@@ -676,7 +676,7 @@
 } // vf_Graph::SetNextCountNode
 
 /**
- * Function recieves first enumerated graph node.
+ * Function receives first enumerated graph node.
  */
 unsigned
 vf_Graph::GetStartCountNode()
@@ -686,7 +686,7 @@
 } // vf_Graph::GetStartCountNode
 
 /**
- * Function recieves graph node relevant to enumeration element.
+ * Function receives graph node relevant to enumeration element.
  */
 unsigned
 vf_Graph::GetCountElementNode( unsigned count )       // graph node number
@@ -697,7 +697,7 @@
 } // vf_Graph::GetCountElementNode
 
 /**
- * Function recieves graph node enumeration count.
+ * Function receives graph node enumeration count.
  */
 unsigned
 vf_Graph::GetNodeCountElement( unsigned node_num )     // graph node number
@@ -958,7 +958,7 @@
 void
 vf_Graph::DumpDotNodeInternal( unsigned num,            // graph node number
                                char *next_node,         // separator between nodes in stream
-                               char *next_instr,        // separator between intructions
in stream
+                               char *next_instr,        // separator between instructions
in stream
                                ofstream &out,           // output file stream
                                vf_Context_t *ctex)      // verifier contex
 {
@@ -1209,7 +1209,7 @@
     if( index )
     {
         /** 
-         * Identify dead code nodes and fill by nop inctruction
+         * Identify dead code nodes and fill by nop instruction
          */
         for( index = handlcount + 1; index < vGraph->GetNodeNumber() - 1; index++ )
{
             if( !vGraph->IsNodeMarked( index ) ) {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/Verifier.cpp Mon Feb  5 09:16:00 2007
@@ -399,8 +399,8 @@
 
 /**
  * Function receives half word (2 bytes) branch offset from bytecode array and
- * sets reseived offset and next instruction offset into instruction.
- * Function returns recieved offset.
+ * sets received offset and next instruction offset into instruction.
+ * Function returns received offset.
  */
 static inline int
 vf_get_double_hword_branch_offset( vf_Instr_t *code,          // instruction
@@ -411,7 +411,7 @@
 {
     // get first branch offset
     int offset = vf_get_hword_offset( code_pc, bytecode, index_p );
-    // create and set edge branchs for instruction
+    // create and set edge branches for instruction
     vf_create_instruction_offset( code, 2, pool );
     // set first edge branch for instruction
     vf_set_instruction_offset( code, 0, offset );
@@ -422,8 +422,8 @@
 
 /**
  * Function receives word (4 bytes) branch offset from bytecode array and
- * sets reseived offset and next instruction offset into instruction.
- * Function returns recieved offset.
+ * sets received offset and next instruction offset into instruction.
+ * Function returns received offset.
  */
 static inline int
 vf_get_double_word_branch_offset( vf_Instr_t *code,          // instruction
@@ -434,7 +434,7 @@
 {
     // get first branch offset
     int offset = vf_get_word_offset( code_pc, bytecode, index_p );
-    // create and set edge branchs for instruction
+    // create and set edge branches for instruction
     vf_create_instruction_offset( code, 2, pool );
     // set first edge branch for instruction
     vf_set_instruction_offset( code, 0, offset );
@@ -445,8 +445,8 @@
 
 /**
  * Function receives tableswitch branch from bytecode array and
- * sets reseived offset into instruction.
- * Function returns recieved branch.
+ * sets received offset into instruction.
+ * Function returns received branch.
  */
 static inline int
 vf_get_tableswitch_alternative( vf_Instr_t *code,           // instruction
@@ -503,7 +503,7 @@
  * Function returns number of alternatives.
  */
 static inline Verifier_Result
-vf_set_lookupswitch_offsets( vf_Instr_t *code,          // inctruction
+vf_set_lookupswitch_offsets( vf_Instr_t *code,          // instruction
                              unsigned code_pc,          // instruction offset in bytecode
                              unsigned *index_p,         // offset index in bytecode array
                              unsigned char *bytecode,   // array of bytecode
@@ -691,7 +691,7 @@
 } // vf_set_vector_stack_entry_addr
 
 /**
- * Function sets signle word data type for given stack map vector entry.
+ * Function sets single word data type for given stack map vector entry.
  */
 static inline void
 vf_set_vector_stack_entry_word( vf_MapEntry_t *vector,  // stack map vector
@@ -1198,12 +1198,12 @@
 } // vf_set_out_vector_stack_entry_ref
 
 /**
- * Function sets return adress data type for code instruction OUT stack map vector entry.
+ * Function sets return address data type for code instruction OUT stack map vector entry.
  */
 static inline void
 vf_set_out_vector_stack_entry_addr( vf_Code_t *code,          // code instruction
                                     unsigned num,             // OUT vector entry number
-                                    unsigned count)           // program coint
+                                    unsigned count)           // program count
 {
     vf_set_vector_stack_entry_addr( code->m_outvector, num, count );
     return;
@@ -1398,7 +1398,7 @@
 void
 vf_set_description_vector( const char *descr,           // descriptor
                            int inlen,                   // number of entries for IN vector
-                           int add,                     // additional number of enties
+                           int add,                     // additional number of entries
                                                         // to IN data flow vector
                            int outlen,                  // number of entries for OUT vector
                            vf_MapEntry_t **invector,    // pointer to IN vector
@@ -3874,7 +3874,7 @@
 } // vf_opcode_newarray
 
 /**
- * Function recieves valid type string of array by array element name.
+ * Function receives valid type string of array by array element name.
  */
 static inline const char *
 vf_get_class_array_valid_type( const char *element_name,    // array element name
@@ -5027,7 +5027,7 @@
                 result = VER_ErrorInstruction;
                 goto labelEnd_vf_parse_bytecode;
             }
-            // skip 2 parametrs (u1 + u1)
+            // skip 2 parameters (u1 + u1)
             index += 1 + 1;
             break;
         case OPCODE_NEW:            /* 0xbb + u2 */
@@ -5239,14 +5239,14 @@
         vf_set_out_vector_stack_entry_ref( &code[index + 1], 0, type );
 
         /** 
-         * Set handler branchs
+         * Set handler branches
          * Set handler branches to last instructions of basic blocks
          */
         for( count = start_pc + 1; count <= end_pc; count++ ) {
             if( count < len && codeInstr[count].m_mark ) {
                 // calculate code instruction number
                 instr = codeInstr[count].m_instr - 1;
-                // check existen of handler array
+                // check existence of handler array
                 if( code[instr].m_handler == NULL ) {
                     // create handler array for code instruction
                     code[instr].m_handler = 
@@ -5313,7 +5313,7 @@
 labelEnd_vf_parse_bytecode:
 
     /**
-     * Free alocated memory
+     * Free allocated memory
      */
     ctex->m_codeNum = codeNum;
     ctex->m_nodeNum = bbCount;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_dataflow.cpp Mon Feb  5 09:16:00
2007
@@ -213,7 +213,7 @@
 
 /**
  * Function merges two vectors and saves result vector to first vector.
- * If first vector was changed, returns true, esle - false.
+ * If first vector was changed, returns true, else - false.
  */
 static inline bool
 vf_merge_vectors( vf_MapVector_t *first,    // first vector
@@ -446,7 +446,7 @@
     {
         return VER_ErrorDataFlow;
     }
-    // check local varible type
+    // check local variable type
     if( source->m_is_local 
         && (!target->m_is_local || source->m_local != target->m_local) )
     {
@@ -489,7 +489,7 @@
     {
     case VF_CHECK_NONE:
     case VF_CHECK_UNINITIALIZED_THIS:
-    case VF_CHECK_PARAM:                // check method invocation convertion
+    case VF_CHECK_PARAM:                // check method invocation conversion
         if( target->m_vtype != NULL ) {
             is_error = ctex->m_type->CheckTypes( target->m_vtype,
                             source->m_vtype, 0, VF_CHECK_PARAM );
@@ -599,7 +599,7 @@
         return VER_ErrorDataFlow;
     }
 
-    // check local varible type
+    // check local variable type
     if( entry1->m_is_local 
         && (!entry2->m_is_local || entry1->m_local != entry2->m_local) )
     {
@@ -1199,7 +1199,7 @@
                          vf_MapVector_t *incoming,      // incoming data flow vector
                          vf_MapEntry_t *buf,            // buf stack map vector
                          unsigned *node_count,          // last graph node in recursion
-                         bool *need_recheck,            // set to true if need to recheck
privious nodes
+                         bool *need_recheck,            // set to true if need to recheck
previous nodes
                          vf_Context_t *ctex)            // verifier context
 {
     // get graph
@@ -1399,7 +1399,7 @@
     vf_Graph_t *graph = ctex->m_graph;
     graph->CleanNodesMark();
 
-    // set first enumiration node
+    // set first enumeration node
     graph->SetStartCountNode(0);
     graph->SetNodeMark( 0, VERIFY_START_MARK );
 
@@ -1408,7 +1408,7 @@
         // get node by count element
         unsigned node_num = graph->GetCountElementNode( index );
         if( node_num == ~0U ) {
-            // remove dead nodes from enumiration
+            // remove dead nodes from enumeration
             continue;
         }
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_real.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_real.h?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_real.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_real.h Mon Feb  5 09:16:00 2007
@@ -46,7 +46,7 @@
  */
 //===========================================================
 /**
- * Define debug mode for verifer.
+ * Define debug mode for verifier.
  */
 #ifdef NDEBUG
 #define _VERIFY_DEBUG 0
@@ -289,7 +289,7 @@
  */
 //===========================================================
 /**
- * Predefined stuctures
+ * Predefined structures
  */
 /// Verifier context structure.
 typedef struct vf_Context vf_Context_t;
@@ -790,13 +790,13 @@
     void SetNextCountNode( unsigned node_num );
 
     /**
-     * Function recieves first enumerated graph node.
+     * Function receives first enumerated graph node.
      * @return First enumerated graph node in graph enumeration structure.
      */
     unsigned GetStartCountNode();
 
     /**
-     * Function recieves graph node relevant to enumeration element.
+     * Function receives graph node relevant to enumeration element.
      * @param count - given enumeration element
      * @return Graph node relevant to enumeration element.
      * @note Assertion is raised if <i>count</i> is out of range.
@@ -804,7 +804,7 @@
     unsigned GetCountElementNode( unsigned count );
 
     /**
-     * Function recieves graph node enumeration count.
+     * Function receives graph node enumeration count.
      * @param node_num - given node
      * @return Graph node enumeration count.
      * @note Assertion is raised if <i>node_num</i> is out of range.
@@ -885,7 +885,7 @@
      * Function dumps graph node instruction in file stream in DOT format.
      * @param node_num   - number of graph node
      * @param next_node  - separator between nodes in stream
-     * @param next_instr - separator between intructions in stream
+     * @param next_instr - separator between instructions in stream
      * @param fout       - output file stream
      * @param context    - current verifier context
      * @note Function is valid in debug mode.
@@ -1190,7 +1190,7 @@
     unsigned m_edgeNum;                 ///< graph edge number
 
     /**
-     * Stucture contains useful valid types
+     * Structure contains useful valid types
      */
     struct vf_ContextVType {
         vf_ValidType_t *m_class;        ///< context a given class valid type
@@ -1202,11 +1202,11 @@
     } m_vtype;
 
     /**
-     * Stucture contains debug dump flags
+     * Structure contains debug dump flags
      */
     struct vf_ContextDump {
         unsigned m_verify : 1;          ///< verify all flag
-        unsigned m_with_subroutine : 1; ///< verified method has subrotine
+        unsigned m_with_subroutine : 1; ///< verified method has subroutine
         unsigned m_constraint : 1;      ///< dump type constraints for class
         unsigned m_code : 1;            ///< print code array in stream
         unsigned m_graph : 1;           ///< print original control flow graph
@@ -1427,7 +1427,7 @@
  * Function parses descriptor and sets input and output data flow vectors.
  * @param descr     - descriptor of method, class or field
  * @param inlen     - number of entries for <i>IN</i> data flow vector
- * @param add       - additional number of enties to <i>IN</i> data flow vector
+ * @param add       - additional number of entries to <i>IN</i> data flow vector
  * @param outlen    - number of entries for <i>OUT</i> data flow vector (for
method)
  * @param invector  - pointer to <i>IN</i> data flow vector
  * @param outvector - pointer to <i>OUT</i> data flow vector
@@ -1461,7 +1461,7 @@
 vf_create_class_valid_type( const char *class_name, vf_Context_t *context );
 
 /**
- * Function provides contraint checks for current class.
+ * Function provides constraint checks for current class.
  * @param context - verifier context
  * @return Check result.
  * @note Provides only checks with loaded classes.

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp?view=diff&rev=503779&r1=503778&r2=503779
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/verifier/ver_utils.cpp Mon Feb  5 09:16:00
2007
@@ -377,7 +377,7 @@
 void
 vf_TypePool::SetRestriction( const char *target,                // target class name
                              const char *source,                // source class name
-                             unsigned short index,              // constrant pool index
+                             unsigned short index,              // constant pool index
                              vf_CheckConstraint_t check_type)   // constraint check type
 {
     vf_TypeConstraint_t *restriction;
@@ -706,7 +706,7 @@
 } // vf_resolve_class
 
 /**
- * Function checkes if target class is super class of source class. 
+ * Function checks if target class is super class of source class. 
  */
 static inline bool
 vf_is_super_class( class_handler source,        // checked class
@@ -722,7 +722,7 @@
 } // vf_is_super_class
 
 /**
- * Function checkes if target class is super interface of source class. 
+ * Function checks if target class is super interface of source class. 
  */
 static inline bool
 vf_is_super_interface( class_handler source,    // checked class
@@ -773,7 +773,7 @@
 } // vf_is_param_valid
 
 /**
- * Function checkes narrow reference conversion between interface classes.
+ * Function checks narrow reference conversion between interface classes.
  * If class1 has method1 and class2 has method2, correspondingly,
  * and methods are the same name and signature, function returns 1.
  * If methods have different return types, function returns 0.
@@ -812,7 +812,7 @@
 } // vf_check_interface_methods
 
 /**
- * Function checkes casting conversion between classes.
+ * Function checks casting conversion between classes.
  */
 static bool
 vf_is_checkcast_valid( class_handler source,    // checked class
@@ -867,7 +867,7 @@
 } // vf_is_checkcast_valid
 
 /**
- * Function checkes assignment conversion between classes.
+ * Function checks assignment conversion between classes.
  *
  * If strict flag is true, strict assignment compatible check is provided,
  * else if strict flag is false, weak assignment compatible check is provided.
@@ -984,7 +984,7 @@
 } // vf_is_assign_valid
 
 /**
- * Function checkes conversions between classes.
+ * Function checks conversions between classes.
  */
 static bool
 vf_is_valid( class_handler source,              // checked class
@@ -1007,7 +1007,7 @@
     case VF_CHECK_DIRECT_SUPER:     // check if target is a direct super class of source
         return class_is_same_class( class_get_super_class( source ), target );
     case VF_CHECK_ACCESS_FIELD:     // protected field access
-    case VF_CHECK_ACCESS_METHOD:    // protected method acceess
+    case VF_CHECK_ACCESS_METHOD:    // protected method access
         return vf_is_super_class( source, current );
     case VF_CHECK_INVOKESPECIAL:    // check object for invokespecial instruction
         return vf_is_super_class( source, current )
@@ -1089,7 +1089,7 @@
  * Checks some constraints without loading of needed classes.
  */
 static inline Verifier_Result
-vf_check_without_loading( vf_TypeConstraint_t *restriction,  // checked constratint
+vf_check_without_loading( vf_TypeConstraint_t *restriction,  // checked constraint
                           vf_Context_t *ctex)                // verifier context
 {
     switch( restriction->check_type )
@@ -1194,7 +1194,7 @@
  * to store restriction to the class for future constraint check.
  */
 static inline Verifier_Result
-vf_check_constraint( vf_TypeConstraint_t *restriction,  // checked constratint
+vf_check_constraint( vf_TypeConstraint_t *restriction,  // checked constraint
                      vf_Context_t *ctex)                // verifier context
 {
     /**
@@ -1321,8 +1321,8 @@
 } // vf_check_access_constraint
 
 /**
- * Function provides initial contraint checks for current class.
- * Function checkes only loaded classes, and stores restriction for unloaded ones.
+ * Function provides initial constraint checks for current class.
+ * Function checks only loaded classes, and stores restriction for unloaded ones.
  */
 Verifier_Result
 vf_check_class_constraints( vf_Context_t *ctex )    // verifier context
@@ -1365,7 +1365,7 @@
 } // vf_check_class_constraints
 
 /**
- * Function checkes constraint for given class.
+ * Function checks constraint for given class.
  * Function loads classes if it's needed.
  */
 static inline Verifier_Result
@@ -1412,7 +1412,7 @@
 
     /**
      * Verifier which is built on Java VM Specification 2nd Edition (4.9.2)
-     * recommendation of verification proccess doesn't check interfaces usage.
+     * recommendation of verification process doesn't check interfaces usage.
      * Unfortunately, a lot of Java applications depends on this neglect.
      * To be compatible with those applications we should do full constraint
      * checks only if -Xverify:all option is present in command line.



Mime
View raw message