harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r490860 - in /harmony/enhanced/drlvm/trunk/vm/vmcore: include/compile.h src/jit/compile.cpp src/util/em64t/base/compile_em64t.cpp src/util/ia32/base/compile_IA32.cpp src/util/ipf/base/compile_ipf.cpp
Date Thu, 28 Dec 2006 22:52:16 GMT
Author: gshimansky
Date: Thu Dec 28 14:52:16 2006
New Revision: 490860

URL: http://svn.apache.org/viewvc?view=rev&rev=490860
Log:
Applied HARMONY-2906 [drlvm] applying code inspection comments to compile.cpp

Tests passed on Ubuntu6 x86, WindowsXP x86 and SuSE9 x86_64


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h?view=diff&rev=490860&r1=490859&r2=490860
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/compile.h Thu Dec 28 14:52:16 2006
@@ -52,8 +52,18 @@
  */
 JIT_Result compile_do_compilation_jit(Method* method, JIT* jit);
 
+/**
+ * Generate a stub in JIT calling convention to pass call
+ * compile_me() on the first method invocation.
+ */
 NativeCodePtr compile_gen_compile_me(Method_Handle method);
-//NativeCodePtr compile_gen_compile_me_exc_throw(int exp);
+
+/**
+ * A function to call on the first method invocation.
+ * @return an entry point of successfully compiled method
+ * @throws an exception otherwise
+ */
+NativeCodePtr compile_me(Method* method);
 
 void patch_code_with_threads_suspended(Byte *code_block, Byte *new_code, size_t size);
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?view=diff&rev=490860&r1=490859&r2=490860
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Thu Dec 28 14:52:16 2006
@@ -580,7 +580,7 @@
     return compile_create_lil_jni_stub(method, (void*)func, nso);
 } //compile_create_jni_stub
 
-static JIT_Result compile_prepare_native_method(Method* method, JIT_Flags flags)
+static JIT_Result compile_prepare_native_method(Method* method)
 {
     TRACE2("compile", "compile_prepare_native_method(" << method_get_name(method) <<
")");
 #ifdef VM_STATS
@@ -681,16 +681,40 @@
     return JIT_SUCCESS;
 }
 
+// Create an exception from a given type and a message.
+// Set cause to the current thread exception.
+static void compile_raise_exception(const char* name, const char* message, Method* method)
+{
+    assert(hythread_is_suspend_enabled());
+    jthrowable old_exc = exn_get();
 
-// Assumes that GC is disabled, but a GC-safe point
-static JIT_Result compile_do_compilation(Method* method, JIT_Flags flags)
+    const char* c = method->get_class()->get_name()->bytes;
+    const char* m = method->get_name()->bytes;
+    const char* d = method->get_descriptor()->bytes;
+    size_t sz = 3 + // a space, a dot, and a terminator
+        strlen(message) +
+        method->get_class()->get_name()->len +
+        method->get_name()->len +
+        method->get_descriptor()->len;
+    char* msg_raw = (char*)STD_MALLOC(sz);
+    assert(msg_raw);
+    sprintf(msg_raw, "%s%s.%s%s", message, c, m, d);
+    assert(strlen(msg_raw) < sz);
+
+    jthrowable new_exc = exn_create(name, msg_raw, old_exc);
+    exn_raise_object(new_exc);
+    STD_FREE(msg_raw);
+}
+
+
+static JIT_Result compile_do_compilation(Method* method)
 {
     ASSERT_RAISE_AREA;
     assert(hythread_is_suspend_enabled());
     tmn_suspend_disable();
     class_initialize_ex(method->get_class());
     tmn_suspend_enable();
-    
+   
     method->lock();
     if (exn_raised()) {
         method->unlock();
@@ -709,12 +733,15 @@
     }
 
     if (method->is_native()) {
-        JIT_Result res = compile_prepare_native_method(method, flags);            
+        JIT_Result res = compile_prepare_native_method(method);            
         if (res == JIT_SUCCESS) {
             compile_flush_generated_code();
             method->set_state(Method::ST_Compiled);
             method->do_jit_recompiled_method_callbacks();
             method->apply_vtable_patches();
+        } else {
+            method->set_state(Method::ST_NotCompiled);
+            compile_raise_exception("java/lang/UnsatisfiedLinkError", "Cannot load native
", method);
         }
         method->unlock();
         return res;
@@ -726,92 +753,43 @@
     }
 }
 
-// Make a suitable exception to throw if compilation fails.
-// We try to create the named exception with a message if this is possible,
-// otherwise we create with default constructor.
-// 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 .
-  // Now it works in gc disabled mode because of prototype.
-    assert(!hythread_is_suspend_enabled());
-    jthrowable old_exc = exn_get();
-    exn_clear();
 
-    const char* c = method->get_class()->get_name()->bytes;
-    const char* m = method->get_name()->bytes;
-    const char* d = method->get_descriptor()->bytes;
-    size_t sz = 25 +
-        method->get_class()->get_name()->len +
-        method->get_name()->len +
-        method->get_descriptor()->len;
-    char* msg_raw = (char*)STD_MALLOC(sz);
-    assert(msg_raw);
-    sprintf(msg_raw, "Error compiling method %s.%s%s", c, m, d);
-    assert(strlen(msg_raw) < sz);
-
-    jthrowable new_exc = exn_create(name, msg_raw, old_exc);
-    exn_clear();
-    STD_FREE(msg_raw);
-
-    return new_exc;
-}
-
-NativeCodePtr compile_jit_a_method(Method* method)
+NativeCodePtr compile_me(Method* method)
 {
     ASSERT_RAISE_AREA;
-    TRACE2("compile", "compile_jit_a_method " << method );
- 
     ASSERT_NO_INTERPRETER;
+    TRACE2("compile", "compile_me " << method);
 
     GcFrame gc;
-    assert(&gc == p_TLS_vmthread->gc_frames); 
     compile_protect_arguments(method, &gc);
-    assert(&gc == p_TLS_vmthread->gc_frames); 
-    
-    JIT_Flags flags;
-    flags.insert_write_barriers = (gc_requires_barriers());
-    assert(&gc == p_TLS_vmthread->gc_frames);
-    tmn_suspend_enable(); 
-    JIT_Result res = compile_do_compilation(method, flags);
-    tmn_suspend_disable();
-    if (res == JIT_SUCCESS) {
-        assert(&gc == p_TLS_vmthread->gc_frames); 
-        NativeCodePtr entry_point = method->get_code_addr();
-        assert(&gc == p_TLS_vmthread->gc_frames); 
-        INFO2("compile.code", "Compiled method " << method
-                << ", entry " << method->get_code_addr());
-
-        if (method->get_pending_breakpoints() != 0)
-            jvmti_set_pending_breakpoints(method);
-        DebugUtilsTI *ti = VM_Global_State::loader_env->TI;
-        if(ti->isEnabled() && ti->is_single_step_enabled()
-            && !method->is_native())
-        {
-            jvmti_set_single_step_breakpoints_for_method(ti, p_TLS_vmthread, method);
-        }
 
-        return entry_point;
+    tmn_suspend_enable();
+    JIT_Result res = compile_do_compilation(method);
+    if (res != JIT_SUCCESS) {
+        INFO2("compile", "Cannot compile " << method);
+        if (!exn_raised()) {
+            compile_raise_exception("java/lang/InternalError", "Cannot compile ", method);
+        }
+        tmn_suspend_disable();
+        return NULL;
     }
+    tmn_suspend_disable();
 
-    assert(!hythread_is_suspend_enabled());
-    
-    INFO2("compile", "Could not compile " << method);
-    const char* exn_class;
-
-    if (!exn_raised()) {
-        if (method->is_native()) {
-            method->set_state(Method::ST_NotCompiled);
-            exn_class = "java/lang/UnsatisfiedLinkError";
-        } else {
-            exn_class = "java/lang/InternalError";
-        }
-        jthrowable exn = compile_make_exception(exn_class, method);
-        exn_raise_object(exn);
+    NativeCodePtr entry_point = method->get_code_addr();
+    INFO2("compile.code", "Compiled method " << method
+            << ", entry " << entry_point);
+
+    if (method->get_pending_breakpoints() != 0)
+        jvmti_set_pending_breakpoints(method);
+    DebugUtilsTI *ti = VM_Global_State::loader_env->TI;
+    if(ti->isEnabled() && ti->is_single_step_enabled()
+        && !method->is_native())
+    {
+        jvmti_set_single_step_breakpoints_for_method(ti, p_TLS_vmthread, method);
     }
-    return NULL;
-} //compile_jit_a_method
 
+    return entry_point;
+} // compile_me
 
 // Adding dynamic generated code info to global list
 // Is used in JVMTI and native frames interface

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp?view=diff&rev=490860&r1=490859&r2=490860
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/compile_em64t.cpp Thu Dec 28
14:52:16 2006
@@ -141,8 +141,6 @@
 //    method handle
 const int32 stack_size = m2n_get_size() + 8 + 120;
 
-NativeCodePtr compile_jit_a_method(Method * method);
-
 static NativeCodePtr compile_get_compile_me_generic() {
     static NativeCodePtr addr = NULL;
     if (addr) {
@@ -185,7 +183,7 @@
     // restore Method_Handle
     stub = mov(stub, rdi_opnd, M_Base_Opnd(rsp_reg, 0));
     // compile the method
-    stub = call(stub, (char *)&compile_jit_a_method);
+    stub = call(stub, (char *)&compile_me);
 
     // pop m2n from the stack
     const int32 bytes_to_m2n_bottom = stack_size - m2n_get_size();

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp?view=diff&rev=490860&r1=490859&r2=490860
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp Thu Dec 28
14:52:16 2006
@@ -171,8 +171,6 @@
 
 /*    BEGIN COMPILE-ME STUBS    */
 
-NativeCodePtr compile_jit_a_method(Method * method);
-
 static NativeCodePtr compile_get_compile_me_generic() {
     static NativeCodePtr addr = NULL;
     if (addr) {
@@ -192,7 +190,7 @@
     // ecx register should contain correct Mehod_Handle
     stub = push(stub, ecx_opnd);
     // compile the method
-    stub = call(stub, (char *)&compile_jit_a_method);
+    stub = call(stub, (char *)&compile_me);
     // remove ecx from the stack
     stub = pop(stub, ecx_opnd);
     // pop m2n from the stack
@@ -262,36 +260,6 @@
 #endif
     return addr;
 } //compile_gen_compile_me
-
-//NativeCodePtr compile_gen_compile_me_exc_throw(int exp)
-//{
-//    // ppervov: FIXME: should rewrite generation stub
-//    //Class* (*p_convert_exn)(unsigned, Class*, Loader_Exception) = linking_error_to_exception_class;
-//    Class* (*p_convert_exn)(unsigned, Class*, unsigned) = NULL;
-//    void (*p_athrow)(ManagedObject*, Class_Handle, Method_Handle, uint8*) = exn_athrow;
-//    LilCodeStub* cs = lil_parse_code_stub("entry 0:rth::void;");
-//    assert(cs);
-//    cs = lil_parse_onto_end(cs,
-//        "push_m2n 0, 0;"
-//        "m2n_save_all;"
-//        "out platform:g4,pint,g4:pint;"
-//        "o0=0:g4;"
-//        "o1=0;"
-//        "o2=%0i:g4;"
-//        "call %1i;"
-//        "out platform:ref,pint,pint,pint:void;"
-//        "o0=0:ref;"
-//        "o1=r;"
-//        "o2=0;"
-//        "o3=0;"
-//        "call.noret %2i;",
-//        exp, p_convert_exn, p_athrow);
-//    assert(cs && lil_is_valid(cs));
-//    NativeCodePtr addr = LilCodeGenerator::get_platform()->compile(cs, "rth_throw_linking_exception",
dump_stubs);
-//    lil_free_code_stub(cs);
-//
-//    return addr;
-//} // compile_gen_compile_me_exc_throw
  
 /*    END COMPILE-ME STUBS    */
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp?view=diff&rev=490860&r1=490859&r2=490860
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp Thu Dec 28 14:52:16
2006
@@ -450,12 +450,10 @@
 
 /*    BEGIN COMPILE-ME STUBS    */
 
-NativeCodePtr compile_jit_a_method(Method * method);
-
 static NativeCodePtr compile_get_compile_me_generic() {
     static NativeCodePtr addr = NULL;
     if (!addr) {
-        NativeCodePtr (*p_jitter)(Method*) = compile_jit_a_method;
+        NativeCodePtr (*p_jitter)(Method*) = compile_me;
         void (*p_rethrow)() = exn_rethrow_if_pending;
         LilCodeStub* cs = lil_parse_code_stub(
             "entry 1:managed:arbitrary;"



Mime
View raw message