harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r473588 - in /incubator/harmony/enhanced/drlvm/trunk/vm: interpreter/src/ port/src/lil/em64t/pim/ vmcore/include/ vmcore/src/util/em64t/base/
Date Sat, 11 Nov 2006 00:17:51 GMT
Author: gshimansky
Date: Fri Nov 10 16:17:50 2006
New Revision: 473588

URL: http://svn.apache.org/viewvc?view=rev&rev=473588
Log:
Applied HARMONY-2152 [drlvm][em64t] build is broken after 1558 have been committed

Since x86_64 is not yet fully supported and patch touched only x86_64 files no
tests were ran. When I tried acceptance tests on em64t server I effectively
shut it down.


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp?view=diff&rev=473588&r1=473587&r2=473588
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp Fri
Nov 10 16:17:50 2006
@@ -75,7 +75,7 @@
     assert(!hythread_is_suspend_enabled());
 
     DEBUG_TRACE("\n<<< interpreter_invoke_native: "
-           << method->get_class()->name->bytes << " "
+           << method->get_class()->get_name()->bytes << " "
            << method->get_name()->bytes
            << method->get_descriptor()->bytes << endl);
 
@@ -102,7 +102,7 @@
 
     jobject _this;
     if (method->is_static()) {
-        _this = (jobject) method->get_class()->class_handle;
+        _this = (jobject) method->get_class()->get_class_handle();
     } else {
         _this = args[pos++].l;
     }
@@ -276,12 +276,12 @@
     }
 
     DEBUG_TRACE("\n<<< native_invoke_static     : "
-           << method->get_class()->name->bytes << " "
+           << method->get_class()->get_name()->bytes << " "
            << method->get_name()->bytes
            << method->get_descriptor()->bytes << endl);
 
     DEBUG_TRACE_PLAIN("interpreter static native: "
-            << frame.method->get_class()->name->bytes
+            << frame.method->get_class()->get_name()->bytes
             << " " << frame.method->get_name()->bytes
             << frame.method->get_descriptor()->bytes << endl);
 
@@ -297,7 +297,7 @@
     uword *ints = fps + 8;
     uword *stacks = ints + 6;
 
-    frame.This = *(method->get_class()->class_handle);
+    frame.This = *(method->get_class()->get_class_handle());
     ints[n_ints++] = (uword) get_jni_native_intf();
     ints[n_ints++] = (uword) &frame.This; 
     word pos = sz - 1;
@@ -441,7 +441,7 @@
                         DEBUG2(
                         "VM WARNING: Reference with null value returned from jni function:\n"
                         "VM WARNING: Method name: "
-                        << method->get_class()->name->bytes
+                        << method->get_class()->get_name()->bytes
                         << "/" << method->get_name()->bytes
                         << method->get_descriptor()->bytes <<
                         "\nVM WARNING: Not allowed, return NULL (0) instead\n");
@@ -559,12 +559,12 @@
     assert(!method->is_static());
 
     DEBUG_TRACE_PLAIN("interpreter virtual native: "
-            << frame.method->get_class()->name->bytes
+            << frame.method->get_class()->get_name()->bytes
             << " " << frame.method->get_name()->bytes
             << frame.method->get_descriptor()->bytes << endl);
 
     DEBUG_TRACE("\n<<< native_invoke_virtual: "
-           << method->get_class()->name->bytes << " "
+           << method->get_class()->get_name()->bytes << " "
            << method->get_name()->bytes
            << method->get_descriptor()->bytes << endl);
 
@@ -723,7 +723,7 @@
                         DEBUG2(
                         "VM WARNING: Reference with null value returned from jni function:\n"
                         "VM WARNING: Method name: "
-                        << method->get_class()->name->bytes
+                        << method->get_class()->get_name()->bytes
                         << "/" << method->get_name()->bytes
                         << method->get_descriptor()->bytes <<
                         "\nVM WARNING: Not allowed, return NULL (0) instead\n");

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp?view=diff&rev=473588&r1=473587&r2=473588
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp
Fri Nov 10 16:17:50 2006
@@ -31,6 +31,7 @@
 #include "m2n_em64t_internal.h"
 #include "nogc.h"
 #include "interpreter.h" // for ASSERT_NO_INTERPRETER
+#include "cci.h"
 
 #include "dump.h"
 #include "vm_stats.h"

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h?view=diff&rev=473588&r1=473587&r2=473588
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Fri Nov 10
16:17:50 2006
@@ -18,6 +18,6 @@
 #ifndef _VERSION_SVN_TAG_
 #define _VERSION_SVN_TAG_
 
-#define VERSION_SVN_TAG  "473506"
+#define VERSION_SVN_TAG  "svn: This client is too old to work with working copy '.'; please
get a newer Subversion client"
 
 #endif // _VERSION_SVN_TAG_

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp?view=diff&rev=473588&r1=473587&r2=473588
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp Fri
Nov 10 16:17:50 2006
@@ -199,7 +199,7 @@
     int64 arg_num = 0;
 
     TRACE2("invoke", "enter method "
-        << method->get_class()->name->bytes << " "
+        << method->get_class()->get_name()->bytes << " "
         << method->get_name()->bytes << " "
         << method->get_descriptor());
 
@@ -226,7 +226,7 @@
             // only compressed references are supported yet
             assert(VM_Global_State::loader_env->compress_references);
             // convert from native to managed NULL
-            ref = ref ? ref : (uint64) Class::managed_null;
+            ref = ref ? ref : (uint64) VM_Global_State::loader_env->managed_null;
             if (gr_nargs < MAX_GR) {
                 gr_args[gr_nargs++] = ref;
             } else {
@@ -323,7 +323,7 @@
         // only compressed references are supported yet
         assert(VM_Global_State::loader_env->compress_references);
         // convert from managed to native NULL
-        ref = ref != (uint64) Class::managed_null ? ref : (uint64) NULL;
+        ref = ref != (uint64) VM_Global_State::loader_env->managed_null ? ref : (uint64)
NULL;
         if (ref) {
             handle = oh_allocate_local_handle();
             handle->object = (ManagedObject*) ref;
@@ -357,7 +357,7 @@
     STD_FREE(stack_args);
 
     TRACE2("invoke", "exit method "
-        << method->get_class()->name->bytes << " "
+        << method->get_class()->get_name()->bytes << " "
         << method->get_name()->bytes << " "
         << method->get_descriptor());
 }

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?view=diff&rev=473588&r1=473587&r2=473588
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Fri Nov 10 16:17:50 2006
@@ -124,7 +124,7 @@
         "jc i0 = %0i:ref, throw_null_pointer;"
         "locals 1;"
         "l0 = i0;",
-        (ManagedObject *) Class::managed_null
+        (ManagedObject *) VM_Global_State::loader_env->managed_null
     );
     assert(cs);
     
@@ -262,7 +262,7 @@
     cs = lil_parse_onto_end(cs,
         "jc i0 = %0i:ref, throw_null_pointer;"
         "in2out platform:g4;",
-        (ManagedObject *) Class::managed_null
+        (ManagedObject *) VM_Global_State::loader_env->managed_null
     );
 
     assert(cs);



Mime
View raw message