harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r633057 - in /harmony/enhanced/drlvm/trunk: make/vm/ vm/vmcore/src/init/ vm/vmcore/src/ncai/ vm/vmcore/src/stack/ vm/vmcore/src/util/ vm/vmcore/src/util/em64t/base/ vm/vmcore/src/util/ia32/base/
Date Mon, 03 Mar 2008 12:15:52 GMT
Author: gshimansky
Date: Mon Mar  3 04:15:37 2008
New Revision: 633057

URL: http://svn.apache.org/viewvc?rev=633057&view=rev
Log:
Applied 0006 patch from HARMONY-5504
[drlvm][port] Restructure DRLVM's sources to extract most of platform dependent code into
portlib

The patch fixes VM compilation after the moving commit at 633055.


Modified:
    harmony/enhanced/drlvm/trunk/make/vm/port.xml
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/native_stack_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/native_stack_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/native_stack.cpp

Modified: harmony/enhanced/drlvm/trunk/make/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/port.xml?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/port.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/port.xml Mon Mar  3 04:15:37 2008
@@ -50,6 +50,10 @@
             <include name="vmem/win/*.c" if="is.windows"/>
             <include name="thread/win/*.c" if="is.windows"/>
             <include name="file_io/*.c"/>
+
+            <include name="modules/*.c"/>
+            <include name="modules/linux/*.c" if="is.unix"/>
+            <include name="modules/win/*.c" if="is.windows"/>
         </patternset>
 
         <depend-includes paths="port.includes"/>
@@ -60,6 +64,7 @@
             <fileset id="port.asm" dir="${vm.home}/port/src">
                 <include name="atomic/win/*.asm" if="is.windows.x86_64"/>
                 <include name="atomic/linux_ipf/port_atomic_asm.asm" if="is.unix.ia64"/>
+                <include name="barriers/linux_ipf/port_barriers.asm" if="is.unix.ia64"/>
             </fileset>
         </compile-asm>
         

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Mon Mar  3 04:15:37
2008
@@ -118,10 +118,10 @@
     }
     return apr_pstrdup(prop_pool, info.dli_fname);
 #else
-    if (! get_all_native_modules(&modules, &modules_count))
+    if (! port_get_all_modules(&modules, &modules_count))
         return NULL;
 
-    native_module_t* module = find_native_module(modules, code_ptr);
+    native_module_t* module = port_find_module(modules, code_ptr);
 
     char* filename = NULL;
 
@@ -129,7 +129,7 @@
         filename = apr_pstrdup(prop_pool, module->filename);
     }
 
-    clear_native_modules(&modules);
+    port_clear_modules(&modules);
 
     return filename;
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp Mon Mar  3 04:15:37 2008
@@ -369,7 +369,7 @@
 
     ncai_set_global_list_modules_dead(*list);
 
-    bool result = get_all_native_modules(&modules, &mod_count);
+    bool result = port_get_all_modules(&modules, &mod_count);
 
     if (!result)
         return NCAI_ERROR_INTERNAL;
@@ -383,12 +383,12 @@
 
         if (error != NCAI_ERROR_NONE)
         {
-            clear_native_modules(&modules);
+            port_clear_modules(&modules);
             return error;
         }
     }
 
-    clear_native_modules(&modules);
+    port_clear_modules(&modules);
     ncai_clean_dead_modules_from_global_list(list);
     ncai_mark_JNI_modules(*list);
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp Mon Mar  3 04:15:37 2008
@@ -48,7 +48,7 @@
         return;
 
     int count;
-    bool res = get_all_native_modules(&g_modules, &count);
+    bool res = port_get_all_modules(&g_modules, &count);
     assert(res && g_modules && count);
 }
 
@@ -65,10 +65,10 @@
     hymutex_lock(sd_lock);
 
     if (g_modules)
-        clear_native_modules(&g_modules);
+        port_clear_modules(&g_modules);
 
     int count;
-    res = get_all_native_modules(&g_modules, &count);
+    res = port_get_all_modules(&g_modules, &count);
     assert(res && g_modules && count);
 
     hymutex_unlock(sd_lock);
@@ -205,7 +205,7 @@
             }
 
             // pure native frame
-            native_module_t* module = find_native_module(g_modules, cur_ip);
+            native_module_t* module = port_find_module(g_modules, cur_ip);
             sd_get_c_method_info(&m, module, cur_ip);
             sd_print_line(count++, &m);
             ++frame_num;
@@ -222,7 +222,7 @@
         if (si_is_native(si) && frame_num < num_frames)
         {
             // Print information from native stack trace for JNI frames
-            native_module_t* module = find_native_module(g_modules, cur_ip);
+            native_module_t* module = port_find_module(g_modules, cur_ip);
             sd_get_c_method_info(&m, module, cur_ip);
             sd_print_line(count, &m);
         }
@@ -290,7 +290,7 @@
 
         if (frame_num < num_frames && frames[frame_num].java_depth < 0)
         { // pure native frame
-            native_module_t* module = find_native_module(g_modules, frames[frame_num].ip);
+            native_module_t* module = port_find_module(g_modules, frames[frame_num].ip);
             sd_get_c_method_info(&m, module, frames[frame_num].ip);
             sd_print_line(count++, &m);
             ++frame_num;
@@ -307,7 +307,7 @@
         if (frame_num < num_frames &&
             (!method || method_is_native(method)))
         {
-            native_module_t* module = find_native_module(g_modules, frames[frame_num].ip);
+            native_module_t* module = port_find_module(g_modules, frames[frame_num].ip);
             sd_get_c_method_info(&m, module, frames[frame_num].ip);
             sd_print_line(count, &m);
         }
@@ -371,14 +371,14 @@
     sd_fill_modules(); // Fill modules table if needed
 #endif
 
-    native_module_t* module = find_native_module(g_modules, (void*)regs->get_ip());
+    native_module_t* module = port_find_module(g_modules, (void*)regs->get_ip());
     sd_parse_module_info(module, (void*)regs->get_ip());
 }
 
 static void sd_print_modules()
 {
     fprintf(stderr, "\nLoaded modules:\n\n");
-    dump_native_modules(g_modules, stderr);
+    port_dump_modules(g_modules, stderr);
 }
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/native_stack_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/native_stack_em64t.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/native_stack_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/native_stack_em64t.cpp Mon
Mar  3 04:15:37 2008
@@ -112,9 +112,9 @@
             return true;
 
         native_module_t* cur_module =
-            find_native_module(context->modules, regs->get_ip());
+            port_find_module(context->modules, regs->get_ip());
         native_module_t* found_module =
-            find_native_module(context->modules, target);
+            port_find_module(context->modules, target);
 
         return (cur_module == found_module);
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/native_stack_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/native_stack_ia32.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/native_stack_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/native_stack_ia32.cpp Mon Mar
 3 04:15:37 2008
@@ -112,9 +112,9 @@
             return true;
 
         native_module_t* cur_module =
-            find_native_module(context->modules, regs->get_ip());
+            port_find_module(context->modules, regs->get_ip());
         native_module_t* found_module =
-            find_native_module(context->modules, target);
+            port_find_module(context->modules, target);
 
         return (cur_module == found_module);
     }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/native_stack.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/native_stack.cpp?rev=633057&r1=633056&r2=633057&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/native_stack.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/native_stack.cpp Mon Mar  3 04:15:37 2008
@@ -104,7 +104,7 @@
         int mod_count;
         native_module_t* mod_list = NULL;
 
-        if (!get_all_native_modules(&mod_list, &mod_count))
+        if (!port_get_all_modules(&mod_list, &mod_count))
             return false;
 
         context->clean_modules = true;
@@ -119,7 +119,7 @@
     if (!native_get_stack_range(context, regs, &context->stack))
     {
         if (context->clean_modules)
-            clear_native_modules(&context->modules);
+            port_clear_modules(&context->modules);
         return false;
     }
 
@@ -133,7 +133,7 @@
 
     if (context->modules && context->clean_modules)
     {
-        clear_native_modules(&context->modules);
+        port_clear_modules(&context->modules);
     }
 
     context->modules = NULL;



Mime
View raw message