Index: jit_runtime_support.cpp =================================================================== --- jit_runtime_support.cpp (revision 490543) +++ jit_runtime_support.cpp (working copy) @@ -228,7 +228,7 @@ // The generic type test sequence first checks for whether the fast scheme // can be used, if so it uses it, otherwise it calls into the VM to do the test. -// This is parameterised by: +// This is parameterized by: // * Is there a null test, if so is null in the type or not // * Should the test outcome be returned or should an exception be thrown on failure, object returned on success // * Is the type known @@ -255,10 +255,10 @@ // Null check if (null!=RTTN_NoNullCheck) { if (null==RTTN_NullMember) { - cs = lil_parse_onto_end(cs, "jc i0!=%0i:ref,null_check_faild;", + cs = lil_parse_onto_end(cs, "jc i0!=%0i:ref,null_check_failed;", VM_Global_State::loader_env->managed_null); cs = lil_parse_onto_end(cs, (res==RTTR_ReturnOutcome ? "r=1:g4; ret;" : "r=i0; ret;")); - cs = lil_parse_onto_end(cs, ":null_check_faild;"); + cs = lil_parse_onto_end(cs, ":null_check_failed;"); } else { cs = lil_parse_onto_end(cs, "jc i0=%0i:ref,failed;", VM_Global_State::loader_env->managed_null); @@ -690,9 +690,9 @@ } /////////////////////////////////////////////////////////// -// Class Initialise +// Class Initialize -// Is a class initialised +// Is a class initialized static POINTER_SIZE_INT is_class_initialized(Class *clss) { #ifdef VM_STATS @@ -723,7 +723,7 @@ } -// Initialise class helper +// Initialize class helper static NativeCodePtr rth_get_lil_initialize_class(int* dyn_count) { static NativeCodePtr addr = NULL; @@ -1687,7 +1687,7 @@ hythread_suspend_disable(); if (ret == NULL) { vm_rt_class_throw_linking_error(klass, cp_idx, opcode); - assert(false); // must be unreachanble + assert(false); // must be unreachable } return ret; } @@ -1949,7 +1949,7 @@ return rth_get_lil_lushr(dyn_count); case VM_RT_LMUL: #ifdef VM_LONG_OPT - case VM_RT_LMUL_CONST_MULTIPLIER: // Not optimised, but functional + case VM_RT_LMUL_CONST_MULTIPLIER: // Not optimized, but functional #endif return rth_get_lil_lmul(dyn_count); case VM_RT_LREM: @@ -1958,9 +1958,9 @@ return rth_get_lil_ldiv(dyn_count); case VM_RT_ULDIV: return rth_get_lil_ludiv(dyn_count); - case VM_RT_CONST_LDIV: // Not optimised, but functional + case VM_RT_CONST_LDIV: // Not optimized, but functional return rth_get_lil_ldiv_const(dyn_count); - case VM_RT_CONST_LREM: // Not optimised, but functional + case VM_RT_CONST_LREM: // Not optimized, but functional return rth_get_lil_lrem_const(dyn_count); case VM_RT_IMUL: return rth_get_lil_imul(dyn_count); @@ -2250,7 +2250,7 @@ // appends code that throws a ClassCastException to a LIL stub static LilCodeStub *gen_lil_throw_ClassCastException_for_inlining(LilCodeStub *cs) { - ABORT("The funclion is depricated, should be never called"); + ABORT("The function is deprecated, should be never called"); // if instanceof returns false, throw an exception LilCodeStub *cs2 = lil_parse_onto_end (cs, Index: primitives_support.cpp =================================================================== --- primitives_support.cpp (revision 490543) +++ primitives_support.cpp (working copy) @@ -243,42 +243,42 @@ switch (sig) { // Value argument signature case 'Z': - // Get the fielID of the value field of a Boolean object: + // Get the fieldID of the value field of a Boolean object: value_id = gid_boolean_value; value.z = GetBooleanField (env, wobj, value_id); break; case 'B': - // Get the fielID of the value field of a Byte object: + // Get the fieldID of the value field of a Byte object: value_id = gid_byte_value; value.b = GetByteField (env, wobj, value_id); break; case 'C': - // Get the fielID of the value field of a Character object: + // Get the fieldID of the value field of a Character object: value_id = gid_char_value; value.c = GetCharField (env, wobj, value_id); break; case 'S': - // Get the fielID of the value field of a Short object: + // Get the fieldID of the value field of a Short object: value_id = gid_short_value; value.s = GetShortField (env, wobj, value_id); break; case 'I': - // Get the fielID of the value field of a Integer object: + // Get the fieldID of the value field of a Integer object: value_id = gid_int_value; value.i = GetIntField (env, wobj, value_id); break; case 'J': - // Get the fielID of the value field of a Long object: + // Get the fieldID of the value field of a Long object: value_id = gid_long_value; value.j = GetLongField (env, wobj, value_id); break; case 'F': - // Get the fielID of the value field of a Float object: + // Get the fieldID of the value field of a Float object: value_id = gid_float_value; value.f = GetFloatField (env, wobj, value_id); break; case 'D': - // Get the fielID of the value field of a Double object: + // Get the fieldID of the value field of a Double object: value_id = gid_double_value; value.d = GetDoubleField (env, wobj, value_id); break; Index: compile.cpp =================================================================== --- compile.cpp (revision 490543) +++ compile.cpp (working copy) @@ -244,7 +244,7 @@ if (nso) cs = nso(cs, method); assert(cs); - // Increment stats (number of nonoverriden calls) + // Increment stats (number of nonoverridden calls) #ifdef VM_STATS cs = lil_parse_onto_end(cs, "inc [%0i:pint];", @@ -261,7 +261,7 @@ cs = oh_gen_allocate_handles(cs, number_of_object_handles, "l0", "l1"); assert(cs); - //***** Part 2: Initialise object handles + //***** Part 2: Initialize object handles if (is_static) { void *jlc = clss->get_class_handle(); @@ -289,7 +289,7 @@ } } - //***** Part 3: Synchronise + //***** Part 3: Synchronize if (is_synchronised) { if (is_static) { cs = lil_parse_onto_end(cs, @@ -446,7 +446,7 @@ assert(cs); } - //***** Part 9: Synchronise + //***** Part 9: Synchronize if (is_synchronised) { if (is_static) { cs = lil_parse_onto_end(cs, @@ -732,7 +732,7 @@ // Then we try to set the cause of the exception to the current thread exception if there is one. // In all cases we ignore any further sources of exceptions and try to proceed anyway. static jthrowable compile_make_exception(const char* name, Method* method) -{ // FIXME: prototype should be changed to getrid of managed objects . +{ // FIXME: prototype should be changed to getid of managed objects . // Now it works in gc disabled mode because of prototype. assert(!hythread_is_suspend_enabled()); jthrowable old_exc = exn_get(); Index: native_overrides.cpp =================================================================== --- native_overrides.cpp (revision 490543) +++ native_overrides.cpp (working copy) @@ -149,7 +149,7 @@ // Is it within limit? cs = lil_parse_onto_end(cs, "jc l2