Index: vm/gc_gen/src/trace_forward/fspace.cpp =================================================================== --- vm/gc_gen/src/trace_forward/fspace.cpp (revision 500956) +++ vm/gc_gen/src/trace_forward/fspace.cpp (working copy) @@ -18,8 +18,6 @@ * @author Xiao-Feng Li, 2006/10/05 */ -#include "platform.h" - #include "fspace.h" Boolean NOS_PARTIAL_FORWARD = FALSE; Index: vm/vmcore/include/jit_runtime_support_common.h =================================================================== --- vm/vmcore/include/jit_runtime_support_common.h (revision 500956) +++ vm/vmcore/include/jit_runtime_support_common.h (working copy) @@ -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); Index: vm/vmcore/include/vm_threads.h =================================================================== --- vm/vmcore/include/vm_threads.h (revision 500956) +++ vm/vmcore/include/vm_threads.h (working copy) @@ -26,7 +26,7 @@ #ifdef PLATFORM_POSIX #include -#include "platform.h" +#include "platform_lowlevel.h" #else #include "vm_process.h" #endif Index: vm/vmcore/include/finalize.h =================================================================== --- vm/vmcore/include/finalize.h (revision 500956) +++ vm/vmcore/include/finalize.h (working copy) @@ -27,8 +27,6 @@ #ifndef _FINALIZE_H_ #define _FINALIZE_H_ -#include "platform.h" - #include "open/types.h" #ifdef USE_GC_STATIC Index: vm/vmcore/include/thread_manager.h =================================================================== --- vm/vmcore/include/thread_manager.h (revision 500956) +++ vm/vmcore/include/thread_manager.h (working copy) @@ -23,7 +23,6 @@ #ifndef THREAD_MANAGER_HEADER #define THREAD_MANAGER_HEADER -#include "platform.h" #include "vm_threads.h" Index: vm/vmcore/src/jni/jni_array.cpp =================================================================== --- vm/vmcore/src/jni/jni_array.cpp (revision 500956) +++ vm/vmcore/src/jni/jni_array.cpp (working copy) @@ -23,7 +23,6 @@ #define LOG_DOMAIN "jni" #include "cxxlog.h" -#include "platform.h" #include "Class.h" #include "environment.h" #include "object_handles.h" Index: vm/vmcore/src/jni/jni.cpp =================================================================== --- vm/vmcore/src/jni/jni.cpp (revision 500956) +++ vm/vmcore/src/jni/jni.cpp (working copy) @@ -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" Index: vm/vmcore/src/jni/jni_utils.cpp =================================================================== --- vm/vmcore/src/jni/jni_utils.cpp (revision 500956) +++ vm/vmcore/src/jni/jni_utils.cpp (working copy) @@ -23,7 +23,6 @@ #define LOG_DOMAIN "jni" #include "cxxlog.h" -#include "platform.h" #include "Class.h" #include "classloader.h" #include "ini.h" Index: vm/vmcore/src/jni/jni_field.cpp =================================================================== --- vm/vmcore/src/jni/jni_field.cpp (revision 500956) +++ vm/vmcore/src/jni/jni_field.cpp (working copy) @@ -20,7 +20,6 @@ */ -//#include "platform.h" #include "cxxlog.h" #include "jni.h" #include "jni_direct.h" Index: vm/vmcore/src/jit/bit_vector.cpp =================================================================== --- vm/vmcore/src/jit/bit_vector.cpp (revision 500956) +++ vm/vmcore/src/jit/bit_vector.cpp (working copy) @@ -21,8 +21,6 @@ -#include "platform.h" - //MVM #include Index: vm/vmcore/src/jit/jit_runtime_support.cpp =================================================================== --- vm/vmcore/src/jit/jit_runtime_support.cpp (revision 500956) +++ vm/vmcore/src/jit/jit_runtime_support.cpp (working copy) @@ -36,8 +36,6 @@ #include #include -#include "platform.h" - #include "Class.h" #include "environment.h" #include "exceptions.h" Index: vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp =================================================================== --- vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp (revision 500956) +++ vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp (working copy) @@ -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); } Index: vm/vmcore/src/class_support/String_Pool.cpp =================================================================== --- vm/vmcore/src/class_support/String_Pool.cpp (revision 500956) +++ vm/vmcore/src/class_support/String_Pool.cpp (working copy) @@ -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, Index: vm/vmcore/src/class_support/method_lookup.cpp =================================================================== --- vm/vmcore/src/class_support/method_lookup.cpp (revision 500956) +++ vm/vmcore/src/class_support/method_lookup.cpp (working copy) @@ -25,7 +25,6 @@ #include "cxxlog.h" #include "environment.h" -#include "platform.h" #include #include "lock_manager.h" #include "nogc.h" Index: vm/vmcore/src/init/finalize.cpp =================================================================== --- vm/vmcore/src/init/finalize.cpp (revision 500956) +++ vm/vmcore/src/init/finalize.cpp (working copy) @@ -19,7 +19,6 @@ * @version $Revision: 1.1.2.2.4.3 $ */ -#include "platform.h" #include "vm_process.h" #include #include Index: vm/vmcore/src/stack/stack_dump.cpp =================================================================== --- vm/vmcore/src/stack/stack_dump.cpp (revision 500956) +++ vm/vmcore/src/stack/stack_dump.cpp (working copy) @@ -29,6 +29,7 @@ #include "stack_trace.h" #include "interpreter_exports.h" #include "cci.h" +#include #ifdef PLATFORM_NT Index: vm/vmcore/src/object/vm_arrays.cpp =================================================================== --- vm/vmcore/src/object/vm_arrays.cpp (revision 500956) +++ vm/vmcore/src/object/vm_arrays.cpp (working copy) @@ -24,7 +24,6 @@ #define LOG_DOMAIN "vm.arrays" #include "cxxlog.h" -#include "platform.h" #include #include "environment.h" Index: vm/vmcore/src/thread/thread_manager.cpp =================================================================== --- vm/vmcore/src/thread/thread_manager.cpp (revision 500956) +++ vm/vmcore/src/thread/thread_manager.cpp (working copy) @@ -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" Index: vm/vmcore/src/thread/lock_manager.cpp =================================================================== --- vm/vmcore/src/thread/lock_manager.cpp (revision 500956) +++ vm/vmcore/src/thread/lock_manager.cpp (working copy) @@ -20,7 +20,6 @@ */ -#include "platform.h" #include "lock_manager.h" #include "vm_threads.h" #include "exceptions.h" Index: vm/vmcore/src/thread/thread_generic.cpp =================================================================== --- vm/vmcore/src/thread/thread_generic.cpp (revision 500956) +++ vm/vmcore/src/thread/thread_generic.cpp (working copy) @@ -23,7 +23,6 @@ #define LOG_DOMAIN "thread" #include "cxxlog.h" -#include "platform.h" #include "vm_process.h" #include @@ -79,12 +78,6 @@ #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" #include "../m2n_ipf_internal.h" Index: vm/vmcore/src/util/linux/signals_ia32.cpp =================================================================== --- vm/vmcore/src/util/linux/signals_ia32.cpp (revision 500956) +++ vm/vmcore/src/util/linux/signals_ia32.cpp (working copy) @@ -26,7 +26,6 @@ #define LOG_DOMAIN "port.old" #include "cxxlog.h" -#include "platform.h" #include #include #include Index: vm/vmcore/src/util/linux/signals_ipf.cpp =================================================================== --- vm/vmcore/src/util/linux/signals_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/linux/signals_ipf.cpp (working copy) @@ -27,7 +27,6 @@ #define LOG_DOMAIN "port.old" #include "cxxlog.h" -#include "platform.h" #include #include #include Index: vm/vmcore/src/util/linux/signals_em64t.cpp =================================================================== --- vm/vmcore/src/util/linux/signals_em64t.cpp (revision 500956) +++ vm/vmcore/src/util/linux/signals_em64t.cpp (working copy) @@ -26,7 +26,6 @@ #define LOG_DOMAIN "port.old" #include "cxxlog.h" -#include "platform.h" #include #include #include Index: vm/vmcore/src/util/linux/stubs.cpp =================================================================== --- vm/vmcore/src/util/linux/stubs.cpp (revision 500956) +++ vm/vmcore/src/util/linux/stubs.cpp (working copy) @@ -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; -} Index: vm/vmcore/src/util/linux/os_wrapper.cpp =================================================================== --- vm/vmcore/src/util/linux/os_wrapper.cpp (revision 500956) +++ vm/vmcore/src/util/linux/os_wrapper.cpp (working copy) @@ -27,7 +27,6 @@ #include #include -#include "platform.h" #include "port_malloc.h" #ifndef __SMP__ Index: vm/vmcore/src/util/linux/include/platform_lowlevel.h =================================================================== --- vm/vmcore/src/util/linux/include/platform_lowlevel.h (revision 500956) +++ vm/vmcore/src/util/linux/include/platform_lowlevel.h (working copy) @@ -21,8 +21,9 @@ #ifndef _PLATFORM_LOWLEVEL_H_ #define _PLATFORM_LOWLEVEL_H_ -#include "platform.h" #include "stdlib.h" +#include +//#include 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_ Index: vm/vmcore/src/util/linux/include/platform.h =================================================================== --- vm/vmcore/src/util/linux/include/platform.h (revision 500956) +++ vm/vmcore/src/util/linux/include/platform.h (working copy) @@ -1,257 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @author Intel, Evgueni Brevnov - * @version $Revision: 1.1.2.1.4.3 $ - */ - - -#ifndef include_platform_h -#define include_platform_h - -#include -#include -#include -#include -#include -#include - -#include "open/types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define __fastcall -#define __stdcall -#if defined(_IPF_) || defined(_EM64T_) -#define stdcall__ -#else -#define stdcall__ __attribute__ ((__stdcall__)) -#endif -#define __cdecl -#define _stat stat -#define WINAPI - -#define WORD unsigned short -#define DWORD unsigned int -#define BOOL unsigned int -#ifdef POINTER64 -#define HANDLE void* -#else -#define HANDLE unsigned int -#endif - -typedef uint32 ULONG; -typedef int32 LONG; -typedef unsigned long long LONGLONG; -typedef uint64 ULONGLONG; - -typedef struct -{ - int64 LowPart; - int64 HighPart; -} FLOAT128; - -#define IN -#define OUT -#define VOID void -typedef void *PVOID; -typedef void *LPVOID; - -typedef unsigned char byte; -typedef unsigned char BYTE; - -#ifdef __INTEL_COMPILER -// __int8 is built-in type in icc -// __int16 is built-in type in icc -// __int32 is built-in type in icc -// __int64 is built-in type in icc -typedef unsigned __int8 __uint8; -typedef unsigned __int16 __uint16; -typedef unsigned __int32 __uint32; -typedef unsigned __int64 __uint64; -#else -typedef unsigned char __uint8; -typedef unsigned short __uint16; -typedef unsigned int __uint32; -typedef unsigned long long __uint64; -typedef signed char __int8; -typedef signed short __int16; -typedef signed int __int32; -typedef signed long long __int64; -#endif - - -typedef signed long long int64; -typedef unsigned char boolean; - -#define dllexport -#define __declspec(junk) - -#ifndef FMT64 -#define FMT64 "ll" -#endif // FMT64 - -typedef struct VM_thread VM_thread; - -/* - * There are two ways to implement Thread-Specific_Data(TSD or Thread Local - * Storage:TLS) in LinuxThreads. - * 1) One is using gs register to declare a segment for pthread_descr_struct, - * where (p_specific[0..31])[0..31] locates in. - * 2) The other way that gets rid of gs register and segment addressing is - * simply to put pthread_descr_struct at the bottom of thread stack. - * - * So for the 1) approach, we use gs:displacement to get the needed TSD; - * for 2), we need get the stack bottom and TSD offset to the bottom. - */ - -#define THREAD_STACK_SIZE 2*1024*1024 //this is the default thread stack size - -//MVM -#ifdef __GLIBC__ -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) - -#define SIZE_OF_PTHREAD_DESCR 1024 -#define OFFSET_OF_SPECIFIC_IN_THREAD_DESCR 300 - -#else -#if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 1) - -#define SIZE_OF_PTHREAD_DESCR 448 -#define OFFSET_OF_SPECIFIC_IN_THREAD_DESCR 236 - -#endif //glibc 2.1 -#endif //glibc 2.2 -#else - -#define SIZE_OF_PTHREAD_DESCR 1024 -#define OFFSET_OF_SPECIFIC_IN_THREAD_DESCR 300 - -#endif // __GLIBC__ - - -#define REVERSE_OFFSET_OF_SPECIFIC_DATA \ - (SIZE_OF_PTHREAD_DESCR - OFFSET_OF_SPECIFIC_IN_THREAD_DESCR) - -#ifndef _IPF_ - -#ifdef USE_SEGMENT // approach 1); turn off by default - -inline void *get_specific00(void){ - register void *specific; - asm volatile( - "movl %%gs:%c1, %0\n\t" - "movl (%0), %0" - :"=r"(specific) - :"i"(OFFSET_OF_SPECIFIC_IN_THREAD_DESCR) - ); - return specific; -} - -#else //not USE_SEGMENT; approach 2), turn on by default -inline void *get_specific00(void){ - register void *specific; - asm volatile( - "mov %%esp, %0\n\t" - "or %1, %0\n\t" - "mov %c2(%0), %0\n\t" - "mov (%0), %0\n\t" - :"=r"(specific) - :"i"( THREAD_STACK_SIZE - 1 ), - "i"( 1 - REVERSE_OFFSET_OF_SPECIFIC_DATA ) - ); - return specific; -} - -/* - * Notes: - * Redhat 7.1 uses approach 1) for libpthread.a, and 2) for libpthread.so. - * Because VM links libpthread.a statically for the executable, we - * use approach 2) by default. - */ - -#endif //USE_SEGMENT - -#endif /* #ifndef _IPF_ */ - -#define N_T_S_H NULL -#define E_H_M NULL -#define E_H_S NULL -#define E_H_I NULL -#define E_H_S0 NULL -#define G_S_R_E_H NULL -#define J_V_M_T_I_E_H NULL -#define E_H_RECOMP NULL - -#include "stdlib.h" - -#include - -#include "stdarg.h" - - -#define INFINITE 0XFFffFFff - -DWORD IJGetLastError(VOID); - -void _fpreset(void); - -typedef struct event_wrapper { - pthread_mutex_t mutex; - pthread_cond_t cond; - __uint32 man_reset_flag; - __uint32 state; - unsigned int n_wait; -} event_wrapper; - - -#define THREAD_PRIORITY_NORMAL 4 - -#define _MAX_PATH PATH_MAX - -struct _finddata_t { - unsigned aa; - long ttc; - long ta; - long tw; - unsigned long size; - char name[260]; - }; - -long _findfirst(const char *, struct _finddata_t *); -int _findnext(long, struct _finddata_t *); -int _findclose(long); - -#define SEEK_CUR 1 -__int64 _lseeki64(int, int64, int); - - -void * _alloca(int); - -typedef void * FARPROC; - -/*inline void vm_terminate_thread(VmThreadHandle thrdaddr) { - pthread_cancel(thrdaddr); -}*/ -#ifdef __cplusplus -} -#endif - -#endif // include_platform_h ****************** - Index: vm/vmcore/src/util/linux/native_modules_ia32.cpp =================================================================== --- vm/vmcore/src/util/linux/native_modules_ia32.cpp (revision 500956) +++ vm/vmcore/src/util/linux/native_modules_ia32.cpp (working copy) @@ -23,7 +23,7 @@ #include #include #include -#include "platform.h" +#include "platform_lowlevel.h" #include "open/types.h" #include "port_malloc.h" #include "native_modules.h" Index: vm/vmcore/src/util/linux/native_modules_em64t.cpp =================================================================== --- vm/vmcore/src/util/linux/native_modules_em64t.cpp (revision 500956) +++ vm/vmcore/src/util/linux/native_modules_em64t.cpp (working copy) @@ -23,7 +23,7 @@ #include #include #include -#include "platform.h" +#include "platform_lowlevel.h" #include "open/types.h" #include "port_malloc.h" #include "native_modules.h" Index: vm/vmcore/src/util/vm_stats.cpp =================================================================== --- vm/vmcore/src/util/vm_stats.cpp (revision 500956) +++ vm/vmcore/src/util/vm_stats.cpp (working copy) @@ -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" Index: vm/vmcore/src/util/win/include/java_lang_thread_nt.h =================================================================== --- vm/vmcore/src/util/win/include/java_lang_thread_nt.h (revision 500956) +++ vm/vmcore/src/util/win/include/java_lang_thread_nt.h (working copy) @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @author Intel, Evgueni Brevnov - * @version $Revision: 1.1.2.1.4.3 $ - */ - - -#define N_T_S_H NULL -#define E_H_M NULL -#define E_H_S NULL -#define E_H_I NULL -#define E_H_S0 NULL -#define G_S_R_E_H NULL -#define J_V_M_T_I_E_H NULL -#define E_H_RECOMP NULL - Index: vm/vmcore/src/util/win/include/platform_lowlevel.h =================================================================== --- vm/vmcore/src/util/win/include/platform_lowlevel.h (revision 500956) +++ vm/vmcore/src/util/win/include/platform_lowlevel.h (working copy) @@ -39,8 +39,6 @@ #include -#include "platform.h" - inline void disable_assert_dialogs() { _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDOUT); @@ -55,11 +53,6 @@ _CrtDbgBreak(); } -inline DWORD IJGetLastError(VOID) -{ - return GetLastError(); -} - struct timespec { long tv_sec; long tv_nsec; Index: vm/vmcore/src/util/win/include/platform.h =================================================================== --- vm/vmcore/src/util/win/include/platform.h (revision 500956) +++ vm/vmcore/src/util/win/include/platform.h (working copy) @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/** - * @author Intel, Evgueni Brevnov - * @version $Revision: 1.1.2.1.4.3 $ - */ - - -#ifndef _PLATFORM_H_ -#define _PLATFORM_H_ - -#define stdcall__ - -typedef unsigned long DWORD; -typedef int BOOL; - -#ifndef FMT64 -#define FMT64 "I64" -#endif // FMT64 - - -#endif /* _PLATFORM_H_ */ Index: vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp =================================================================== --- vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp (revision 500956) +++ vm/vmcore/src/util/ia32/base_natives/java_lang_thread_ia32.cpp (working copy) @@ -19,9 +19,6 @@ * @version $Revision: 1.1.2.1.4.3 $ */ - - -#include "platform.h" #include //MVM Index: vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp =================================================================== --- vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp (revision 500956) +++ vm/vmcore/src/util/ia32/base/jit_generic_rt_support_ia32.cpp (working copy) @@ -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) { Index: vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp =================================================================== --- vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp (revision 500956) +++ vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp (working copy) @@ -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) { Index: vm/vmcore/src/util/ia32/base/compile_IA32.cpp =================================================================== --- vm/vmcore/src/util/ia32/base/compile_IA32.cpp (revision 500956) +++ vm/vmcore/src/util/ia32/base/compile_IA32.cpp (working copy) @@ -22,8 +22,6 @@ #define LOG_DOMAIN "vm.helpers" #include "cxxlog.h" -#include "platform.h" - //MVM #include Index: vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/exceptions_ipf.cpp (working copy) @@ -19,8 +19,6 @@ * @version $Revision: 1.1.2.1.4.3 $ */ -#include "platform.h" - //MVM #include Index: vm/vmcore/src/util/ipf/base/defines.h =================================================================== --- vm/vmcore/src/util/ipf/base/defines.h (revision 500956) +++ vm/vmcore/src/util/ipf/base/defines.h (working copy) @@ -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 Index: vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (working copy) @@ -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" Index: vm/vmcore/src/util/ipf/base/compile_ipf.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/compile_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/compile_ipf.cpp (working copy) @@ -26,8 +26,6 @@ // appropriate stub. // -#include "platform.h" - //MVM #include Index: vm/vmcore/src/util/ipf/base/stub_code_utils.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/stub_code_utils.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/stub_code_utils.cpp (working copy) @@ -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 #include "environment.h" Index: vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/arithmetic_helpers_ipf.cpp (working copy) @@ -20,9 +20,6 @@ */ // - -#include "platform.h" - //MVM #include Index: vm/vmcore/src/util/ipf/base/ini_ipf.cpp =================================================================== --- vm/vmcore/src/util/ipf/base/ini_ipf.cpp (revision 500956) +++ vm/vmcore/src/util/ipf/base/ini_ipf.cpp (working copy) @@ -23,9 +23,6 @@ // Internal Native Interface // - -#include "platform.h" - //MVM #include Index: vm/em/src/EBProfileCollector.h =================================================================== --- vm/em/src/EBProfileCollector.h (revision 500956) +++ vm/em/src/EBProfileCollector.h (working copy) @@ -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); Index: vm/gcv4/src/hash_table.h =================================================================== --- vm/gcv4/src/hash_table.h (revision 500956) +++ vm/gcv4/src/hash_table.h (working copy) @@ -23,7 +23,6 @@ #ifndef _hash_table_H_ #define _hash_table_H_ -#include "platform_lowlevel.h" #include "open/types.h" // Index: vm/gcv4/src/hash_table.cpp =================================================================== --- vm/gcv4/src/hash_table.cpp (revision 500956) +++ vm/gcv4/src/hash_table.cpp (working copy) @@ -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; Index: vm/gcv4/src/pair_table.cpp =================================================================== --- vm/gcv4/src/pair_table.cpp (revision 500956) +++ vm/gcv4/src/pair_table.cpp (working copy) @@ -23,7 +23,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // VM interface header files -#include "platform.h" #include "open/vm_gc.h" #include "pair_table.h" #include "string.h" Index: vm/interpreter/src/interp_defs.h =================================================================== --- vm/interpreter/src/interp_defs.h (revision 500956) +++ vm/interpreter/src/interp_defs.h (working copy) @@ -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" Index: vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp =================================================================== --- vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (revision 500956) +++ vm/jitrino/src/codegenerator/ia32/Ia32InstCodeSelector.cpp (working copy) @@ -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"