harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r501408 - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/trace_forward/ gcv4/src/ interpreter/src/ jitrino/src/codegenerator/ia32/ vmcore/include/ vmcore/src/class_support/ vmcore/src/init/ vmcore/src/jit/ vmcore/src/jni/ vmcore/sr...
Date Tue, 30 Jan 2007 14:55:02 GMT
Author: gshimansky
Date: Tue Jan 30 06:54:52 2007
New Revision: 501408

URL: http://svn.apache.org/viewvc?view=rev&rev=501408
Log:
Applied HARMONY-3073 [drlvm][classloader] Eliminate platform.h file from vm

Tests passed on Ubuntu6 x86, Windows 2003 server x86 and SuSE9 x86_64


Removed:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/java_lang_thread_nt.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform.h
Modified:
    harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp
    harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.cpp
    harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.h
    harmony/enhanced/drlvm/trunk/vm/gcv4/src/pair_table.cpp
    harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_runtime_support_common.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/method_lookup.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/bit_vector.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/lock_manager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/compile_IA32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/defines.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform_lowlevel.h
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/os_wrapper.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/stubs.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform_lowlevel.h

Modified: harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/em/src/EBProfileCollector.h Tue Jan 30 06:54:52 2007
@@ -102,7 +102,7 @@
 Method_Profile_Handle eb_profiler_create_profile(PC_Handle ph, Method_Handle mh);
 void* eb_profiler_get_entry_counter_addr(Method_Profile_Handle mph);
 void*eb_profiler_get_backedge_counter_addr(Method_Profile_Handle mph);
-void  __stdcall eb_profiler_sync_mode_callback(PC_Handle mph) stdcall__;
+void  __stdcall eb_profiler_sync_mode_callback(PC_Handle mph);
 char  eb_profiler_is_in_sync_mode(PC_Handle pch);
 uint32 eb_profiler_get_entry_threshold(PC_Handle pch);
 uint32 eb_profiler_get_backedge_threshold(PC_Handle pch);

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/trace_forward/fspace.cpp Tue Jan 30 06:54:52
2007
@@ -18,8 +18,6 @@
  * @author Xiao-Feng Li, 2006/10/05
  */
 
-#include "platform.h"
-
 #include "fspace.h"
 
 Boolean NOS_PARTIAL_FORWARD = FALSE;

Modified: harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.cpp Tue Jan 30 06:54:52 2007
@@ -78,15 +78,7 @@
     //TRACE("Making new hash table with size_in_entries " << _size_in_entries 
     //    << " and threashhold_entries " << _threshold_entries);
     _table = (volatile void **)STD_MALLOC(_size_in_bytes);
-    if (_table == NULL) {
-        DWORD LastError = IJGetLastError();
-        fprintf(stderr,
-                "Error: STD_MALLOC failed when creating hash table "
-                "%d (0x%x)\n",
-                LastError, LastError);
-        assert(LastError);
-    }
-
+    assert(_table != NULL);
     memset(_table, 0, _size_in_bytes);
 
     //TRACE("Created hash_table " << (void *)this);
@@ -547,27 +539,12 @@
     _save_pointer         = 0;
 
     _key_table = (volatile void **)STD_MALLOC(_size_in_bytes);
-    if (_key_table == NULL) {
-        DWORD LastError = IJGetLastError();
-        fprintf(stderr,
-                "Error: STD_MALLOC failed when creating key val hash table "
-                "%d (0x%x)\n",
-                LastError, LastError);
-        assert(LastError);
-    }
+    assert(_key_table != NULL);
     memset(_key_table, 0, _size_in_bytes);
 
     int val_size_in_bytes = _size_in_entries * (sizeof(LONG));
     _val_table = (LONG *)STD_MALLOC(val_size_in_bytes);
-
-    if (_val_table == NULL) {
-        DWORD LastError = IJGetLastError();
-        fprintf(stderr,
-                "Error: STD_MALLOC failed when creating key val hash table "
-                "%d (0x%x)\n",
-                LastError, LastError);
-        assert(LastError);
-    }
+    assert(_val_table != NULL); 
     memset((void *)_val_table, 0, val_size_in_bytes);
 
     return;

Modified: harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gcv4/src/hash_table.h Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 #ifndef _hash_table_H_
 #define _hash_table_H_
 
-#include "platform_lowlevel.h"
 #include "open/types.h"
 
 //

Modified: harmony/enhanced/drlvm/trunk/vm/gcv4/src/pair_table.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gcv4/src/pair_table.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gcv4/src/pair_table.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gcv4/src/pair_table.cpp Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // VM interface header files
-#include "platform.h"
 #include "open/vm_gc.h"
 #include "pair_table.h"
 #include "string.h"

Modified: harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/interpreter/src/interp_defs.h Tue Jan 30 06:54:52 2007
@@ -22,7 +22,6 @@
 #define LOG_DOMAIN "interpreter.unspecified"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "environment.h"
 #include "vm_threads.h"
 #include "open/bytecodes.h"

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp
Tue Jan 30 06:54:52 2007
@@ -19,9 +19,6 @@
  * @version $Revision: 1.23.8.2.4.4 $
  */
 
-#ifdef VM_POSIX
-#include "platform.h"
-#endif
 #include "Log.h"
 #include "Ia32InstCodeSelector.h"
 #include "Ia32CodeGenerator.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/finalize.h Tue Jan 30 06:54:52 2007
@@ -27,8 +27,6 @@
 #ifndef _FINALIZE_H_
 #define _FINALIZE_H_
 
-#include "platform.h"
-
 #include "open/types.h"
 
 #ifdef USE_GC_STATIC

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_runtime_support_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_runtime_support_common.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_runtime_support_common.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/jit_runtime_support_common.h Tue Jan 30
06:54:52 2007
@@ -27,19 +27,19 @@
 #define _JIT_RUNTIME_SUPPORT_COMMON_H_
 
 #include "lil.h"
-
+#include "platform_lowlevel.h"
 #include "heap.h"
 
 VMEXPORT // temporary solution for interpreter unplug
-int __stdcall vm_instanceof(ManagedObject *obj, Class *c) stdcall__;
+int __stdcall vm_instanceof(ManagedObject *obj, Class *c);
 
 // Implements VM_RT_AASTORE
 void * __stdcall
-vm_rt_aastore(ManagedObject *elem, int idx, Vector_Handle array) stdcall__;
+vm_rt_aastore(ManagedObject *elem, int idx, Vector_Handle array);
 
 // Implements VM_RT_AASTORE_TEST
 int __stdcall
-vm_aastore_test(ManagedObject *elem, Vector_Handle array) stdcall__;
+vm_aastore_test(ManagedObject *elem, Vector_Handle array);
 
 
 void *vm_get_interface_vtable(ManagedObject *obj, Class *iid);

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/thread_manager.h Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 #ifndef THREAD_MANAGER_HEADER
 #define THREAD_MANAGER_HEADER
 
-#include "platform.h"
 #include "vm_threads.h"
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h Tue Jan 30 06:54:52 2007
@@ -26,7 +26,7 @@
 
 #ifdef PLATFORM_POSIX
 #include <semaphore.h>
-#include "platform.h"
+#include "platform_lowlevel.h"
 #else
 #include "vm_process.h"
 #endif

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/class_support/String_Pool.cpp Tue Jan 30 06:54:52
2007
@@ -331,7 +331,6 @@
             (COMPRESSED_REFERENCE)((POINTER_SIZE_INT)lang_string
             - (POINTER_SIZE_INT)VM_Global_State::loader_env->heap_base);
         assert(is_compressed_reference(compressed_lang_string));     
-        assert(sizeof(LONG) == sizeof(uint32));
         uint32 result = apr_atomic_cas32(
             /*destination*/ (volatile uint32 *)&str->intern.compressed_ref, 
             /*exchange*/    compressed_lang_string,  

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=501408&r1=501407&r2=501408
==============================================================================
--- 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 Tue Jan 30
06:54:52 2007
@@ -25,7 +25,6 @@
 #include "cxxlog.h"
 
 #include "environment.h"
-#include "platform.h"
 #include <assert.h>
 #include "lock_manager.h"
 #include "nogc.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp Tue Jan 30 06:54:52 2007
@@ -19,7 +19,6 @@
  * @version $Revision: 1.1.2.2.4.3 $
  */
 
-#include "platform.h"
 #include "vm_process.h"
 #include <stdio.h>
 #include <assert.h>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/bit_vector.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/bit_vector.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/bit_vector.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/bit_vector.cpp Tue Jan 30 06:54:52 2007
@@ -21,8 +21,6 @@
 
 
 
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/jit_runtime_support.cpp Tue Jan 30 06:54:52
2007
@@ -36,8 +36,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "platform.h"
-
 #include "Class.h"
 #include "environment.h"
 #include "exceptions.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Tue Jan 30 06:54:52 2007
@@ -31,7 +31,6 @@
 #include "open/jthread.h"
 #include "open/vm_util.h"
 
-#include "platform.h"
 #include "lock_manager.h"
 #include "Class.h"
 #include "classloader.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_array.cpp Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 #define LOG_DOMAIN "jni"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "Class.h"
 #include "environment.h"
 #include "object_handles.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_field.cpp Tue Jan 30 06:54:52 2007
@@ -20,7 +20,6 @@
  */  
 
 
-//#include "platform.h"
 #include "cxxlog.h"
 #include "jni.h"
 #include "jni_direct.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni_utils.cpp Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 #define LOG_DOMAIN "jni"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "Class.h"
 #include "classloader.h"
 #include "ini.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp Tue Jan
30 06:54:52 2007
@@ -266,7 +266,7 @@
     return true;
 }
 
-boolean JNICALL Java_java_lang_Runtime_00024SubProcess_getState0 (JNIEnv *env, jobject obj,
jint handle) { 
+jboolean JNICALL Java_java_lang_Runtime_00024SubProcess_getState0 (JNIEnv *env, jobject obj,
jint handle) { 
     return waitFor(env, obj, handle);
 }
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/vm_arrays.cpp Tue Jan 30 06:54:52 2007
@@ -24,7 +24,6 @@
 #define LOG_DOMAIN "vm.arrays"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include <assert.h>
 
 #include "environment.h"

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?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_dump.cpp Tue Jan 30 06:54:52 2007
@@ -29,6 +29,7 @@
 #include "stack_trace.h"
 #include "interpreter_exports.h"
 #include "cci.h"
+#include <ctype.h>
 
 #ifdef PLATFORM_NT
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/lock_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/lock_manager.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/lock_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/lock_manager.cpp Tue Jan 30 06:54:52
2007
@@ -20,7 +20,6 @@
  */  
 
 
-#include "platform.h"
 #include "lock_manager.h"
 #include "vm_threads.h"
 #include "exceptions.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_generic.cpp Tue Jan 30 06:54:52
2007
@@ -23,7 +23,6 @@
 #define LOG_DOMAIN "thread"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "vm_process.h"
 #include <assert.h>
 
@@ -78,12 +77,6 @@
 #include "mon_enter_exit.h"
 #include "jni_direct.h"
 #include "port_malloc.h"
-
-
-#ifdef PLATFORM_NT
-// wjw -- following lines needs to be generic for all OSs
-#include "java_lang_thread_nt.h"
-#endif
 
 #ifdef _IPF_
 #include "java_lang_thread_ipf.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Tue Jan 30 06:54:52
2007
@@ -62,10 +62,7 @@
 #include "interpreter.h"
 #include "exceptions_int.h"
 
-#ifdef PLATFORM_NT
-// wjw -- following lines needs to be generic for all OSs
-#include "java_lang_thread_nt.h"
-#elif defined _IPF_
+#ifdef _IPF_
 #include "java_lang_thread_ipf.h"
 #elif defined _EM64T_
 //#include "java_lang_thread_em64t.h"

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=501408&r1=501407&r2=501408
==============================================================================
--- 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 Tue Jan 30
06:54:52 2007
@@ -22,8 +22,6 @@
 #define LOG_DOMAIN "vm.helpers"
 #include "cxxlog.h"
 
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp
Tue Jan 30 06:54:52 2007
@@ -32,7 +32,7 @@
 #include "cxxlog.h"
 
 #include "jit_runtime_support.h"
-
+#include "platform_lowlevel.h"
 #include "nogc.h" // for malloc_fixed_code_for_jit()
 #include "encoder.h"
 #include "vm_arrays.h"
@@ -204,7 +204,7 @@
 } //getaddress__vm_lushr_naked
 
 
-static int64 __stdcall vm_lmul(int64 m, int64 n) stdcall__;
+static int64 __stdcall vm_lmul(int64 m, int64 n);
 
 static int64 __stdcall vm_lmul(int64 m, int64 n)
 {
@@ -214,7 +214,7 @@
 } //vm_lmul
 
 #ifdef VM_LONG_OPT
-static int64 __stdcall vm_lmul_const_multiplier(int64 m, int64 n) stdcall__;
+static int64 __stdcall vm_lmul_const_multiplier(int64 m, int64 n);
 
 static int64 __stdcall vm_lmul_const_multiplier(int64 m, int64 n)
 {
@@ -232,7 +232,7 @@
 #endif
 
 
-static int64 __stdcall do_lrem(int64 m, int64 n) stdcall__;
+static int64 __stdcall do_lrem(int64 m, int64 n);
 
 static int64 __stdcall do_lrem(int64 m, int64 n)
 {
@@ -675,7 +675,7 @@
 } //getaddress__vm_d2l
 
 
-static int64 __stdcall vm_d2l(double d) stdcall__;
+static int64 __stdcall vm_d2l(double d);
 
 static int64 __stdcall vm_d2l(double d)
 {
@@ -851,7 +851,7 @@
 } //getaddress__vm_f2l
 
 
-static int64 __stdcall vm_f2l(float f) stdcall__;
+static int64 __stdcall vm_f2l(float f);
 
 static int64 __stdcall vm_f2l(float f)
 {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
Tue Jan 30 06:54:52 2007
@@ -493,7 +493,7 @@
 static void *__stdcall
 aastore_ia32(volatile ManagedObject *elem,
              int idx,
-             Vector_Handle array) stdcall__;
+             Vector_Handle array);
 
 
 // 20030321 This JIT support routine expects to be called directly from managed code. 
@@ -1034,7 +1034,7 @@
 } //getaddress__gc_write_barrier_fastcall
 
 
-static int64 __stdcall vm_lrem(int64 m, int64 n) stdcall__;
+static int64 __stdcall vm_lrem(int64 m, int64 n);
 
 static int64 __stdcall vm_lrem(int64 m, int64 n)
 {
@@ -1082,7 +1082,7 @@
 } //getaddress__vm_lrem_naked
 
 
-static int64 __stdcall vm_ldiv(int64 m, int64 n) stdcall__;
+static int64 __stdcall vm_ldiv(int64 m, int64 n);
 
 static int64 __stdcall vm_ldiv(int64 m, int64 n)
 {

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp
Tue Jan 30 06:54:52 2007
@@ -19,9 +19,6 @@
  * @version $Revision: 1.1.2.1.4.3 $
  */  
 
-
-
-#include "platform.h"
 #include <assert.h>
 
 //MVM

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp Tue
Jan 30 06:54:52 2007
@@ -20,9 +20,6 @@
  */  
 //
 
-
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

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=501408&r1=501407&r2=501408
==============================================================================
--- 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 Tue Jan 30 06:54:52
2007
@@ -26,8 +26,6 @@
 // appropriate stub.
 //
 
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/defines.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/defines.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/defines.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/defines.h Tue Jan 30 06:54:52
2007
@@ -23,8 +23,6 @@
 #ifndef _L1A_DEFINES_H
 #define _L1A_DEFINES_H
 
-#include "platform.h"
-
 #define Array_Operand L1a_Array_Operand
 #define Bounds_Checking L1a_Bounds_Checking
 #define Branch_Patch L1a_Branch_Patch

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp Tue Jan 30
06:54:52 2007
@@ -19,8 +19,6 @@
  * @version $Revision: 1.1.2.1.4.3 $
  */  
 
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp Tue Jan 30 06:54:52
2007
@@ -23,9 +23,6 @@
 // Internal Native Interface
 //
 
-
-#include "platform.h"
-
 //MVM
 #include <iostream>
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Tue
Jan 30 06:54:52 2007
@@ -41,7 +41,6 @@
 #include "open/gc.h"
 #include "open/vm_util.h"
 
-#include "platform.h"
 #include "environment.h"
 #include "Class.h"
 #include "object_generic.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/stub_code_utils.cpp Tue Jan 30
06:54:52 2007
@@ -21,8 +21,6 @@
 //  Routines used by the VM to emit stub code for the ipf. These routines use the ipf code
compactor.
 //
 
-
-#include "platform.h"
 #include <assert.h>
 
 #include "environment.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform_lowlevel.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform_lowlevel.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform_lowlevel.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/include/platform_lowlevel.h Tue
Jan 30 06:54:52 2007
@@ -21,8 +21,9 @@
 #ifndef _PLATFORM_LOWLEVEL_H_
 #define _PLATFORM_LOWLEVEL_H_
 
-#include "platform.h"
 #include "stdlib.h"
+#include <limits.h>
+//#include <ctype.h>
 
 inline void disable_assert_dialogs() {
     /* NOP on Linux */
@@ -31,5 +32,24 @@
 inline void debug_break() {
     abort();
 }
+#ifdef __cplusplus
+extern "C" {
+#endif
 
+#define __fastcall
+#if defined(_IPF_) || defined(_EM64T_)
+#define __stdcall
+#else
+#define __stdcall  __attribute__ ((__stdcall__))
+#endif
+#define __cdecl
+
+#define dllexport
+#define __declspec(junk)
+
+#define _MAX_PATH PATH_MAX
+
+#ifdef __cplusplus
+}
+#endif
 #endif // _PLATFORM_LOWLEVEL_H_

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_em64t.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_em64t.cpp Tue Jan
30 06:54:52 2007
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "platform.h"
+#include "platform_lowlevel.h"
 #include "open/types.h"
 #include "port_malloc.h"
 #include "native_modules.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_ia32.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/native_modules_ia32.cpp Tue Jan
30 06:54:52 2007
@@ -23,7 +23,7 @@
 #include <memory.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "platform.h"
+#include "platform_lowlevel.h"
 #include "open/types.h"
 #include "port_malloc.h"
 #include "native_modules.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/os_wrapper.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/os_wrapper.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/os_wrapper.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/os_wrapper.cpp Tue Jan 30 06:54:52
2007
@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "platform.h"
 #include "port_malloc.h"
 
 #ifndef __SMP__

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_em64t.cpp Tue Jan 30 06:54:52
2007
@@ -26,7 +26,6 @@
 #define LOG_DOMAIN "port.old"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ia32.cpp Tue Jan 30 06:54:52
2007
@@ -26,7 +26,6 @@
 #define LOG_DOMAIN "port.old"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/signals_ipf.cpp Tue Jan 30 06:54:52
2007
@@ -27,7 +27,6 @@
 #define LOG_DOMAIN "port.old"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/stubs.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/stubs.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/stubs.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/linux/stubs.cpp Tue Jan 30 06:54:52 2007
@@ -23,7 +23,6 @@
 #define LOG_DOMAIN "port.old"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "vm_threads.h"
 #include "exceptions.h"
 #include "method_lookup.h"
@@ -35,13 +34,6 @@
 #pragma warning (disable:584) // omission of exception specification is incompatible with
previous function "__errno_location" (declared at line 38 of "/usr/include/bits/errno.h")
 #endif
 
-extern int errno;
-
 #if defined (__INTEL_COMPILER)
 #pragma warning( pop )
 #endif
-
-DWORD IJGetLastError(VOID)
-{
-    return errno;
-}

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp Tue Jan 30 06:54:52 2007
@@ -24,7 +24,6 @@
 #define LOG_DOMAIN "vm.stats"
 #include "cxxlog.h"
 
-#include "platform.h"
 #include "environment.h"
 #include "open/vm_util.h"
 #include "method_lookup.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform_lowlevel.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform_lowlevel.h?view=diff&rev=501408&r1=501407&r2=501408
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform_lowlevel.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/include/platform_lowlevel.h Tue Jan
30 06:54:52 2007
@@ -39,8 +39,6 @@
 
 #include <crtdbg.h>
 
-#include "platform.h"
-
 inline void disable_assert_dialogs() {
     _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
     _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDOUT);
@@ -53,11 +51,6 @@
 
 inline void debug_break() {
     _CrtDbgBreak();
-}
-
-inline DWORD IJGetLastError(VOID)
-{
-    return GetLastError();
 }
 
 struct timespec {



Mime
View raw message