harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r453432 - in /incubator/harmony/enhanced/drlvm/trunk: build/make/targets/ vm/include/open/ vm/tests/unit/thread/ vm/tests/unit/thread/utils/ vm/vmcore/src/jvmti/
Date Fri, 06 Oct 2006 00:03:40 GMT
Author: geirm
Date: Thu Oct  5 17:03:39 2006
New Revision: 453432

URL: http://svn.apache.org/viewvc?view=rev&rev=453432
Log:
HARMONY-1698
HARMONY-1574

Committed both.  Builds fine on x86 32 bit.  Please test and patch on x_64

Ubuntu 6 - nothing broke for smoke, c-unit, kernel


Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
    incubator/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
    incubator/harmony/enhanced/drlvm/trunk/vm/include/open/thread_externals.h
    incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_suspend.c
    incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_thin_monitor.c
    incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/utils/tm2vm.c
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Thu Oct  5 17:03:39
2006
@@ -49,6 +49,11 @@
                 <compilerarg value="-g" />
                 <compilerarg value="-O0" />
             </select>
+	    <select arch="em64t">
+		<defineset define="_EM64T_" />
+		<defineset define="POINTER64" />
+		<defineset define="LAZY_LOCK" />
+	    </select>
         </compiler>
         <!-- Compiling framework -->
         <echo message="## Compiling framework..." />

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/include/open/hycomp.h Thu Oct  5 17:03:39 2006
@@ -48,7 +48,7 @@
 #define HY_PLATFORM_DOUBLE_ORDER
 #if defined(LINUX)
 /* NOTE: Linux supports different processors -- do not assume 386 */
-#if defined(LINUXPPC64)
+#if defined(LINUXPPC64) || defined(POINTER64)
 #define DATA_TYPES_DEFINED
 typedef unsigned long int UDATA;        /* 64bits */
 typedef unsigned long int U_64;
@@ -61,7 +61,7 @@
 typedef signed short I_16;
 typedef signed char I_8;
 //typedef U_32 BOOLEAN;
-#if defined(LINUXPPC64)
+#if defined(LINUXPPC64) || defined(POINTER64)
 #define TOC_UNWRAP_ADDRESS(wrappedPointer) ((void *) (wrappedPointer)[0])
 #define TOC_STORE_TOC(dest,wrappedPointer) (dest = ((UDATA*)wrappedPointer)[1])
 #endif

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/include/open/thread_externals.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/include/open/thread_externals.h?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/include/open/thread_externals.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/include/open/thread_externals.h Thu Oct  5 17:03:39
2006
@@ -23,6 +23,7 @@
 #define OPEN_THREAD_EXTERNALS_H
 
 #include "open/types.h"
+#include "open/hycomp.h"
 #include <jni.h>
 #include "jvmti_types.h"
 #ifdef __cplusplus
@@ -73,11 +74,11 @@
 /** 
   * registtrate thread in VM, so it could execute Java
   */
-VMEXPORT int vm_attach();
+VMEXPORT IDATA vm_attach();
 /**
   * free java related resources before thread exit
   */
-VMEXPORT int vm_detach();
+VMEXPORT IDATA vm_detach();
 
 /**
  * creates exception object using given class name and message and throws it
@@ -86,13 +87,13 @@
  * @param[in] message char* -message
  * @return int.
  */
-VMEXPORT int jthread_throw_exception(char* name, char* message);
+VMEXPORT IDATA jthread_throw_exception(char* name, char* message);
 
 /**
  * Throws given exception object; Desides whether current thread is unwindable
  * and throws it, raises exception otherwise;
  */
-VMEXPORT int jthread_throw_exception_object(jobject object);
+VMEXPORT IDATA jthread_throw_exception_object(jobject object);
 
 // TI support interface
 VMEXPORT void jvmti_send_thread_start_end_event(int);

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_suspend.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_suspend.c?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_suspend.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_suspend.c Thu
Oct  5 17:03:39 2006
@@ -111,14 +111,14 @@
     
     hythread_join(thread);
     
-    tf_assert_same((int)args[1], 1);
+    tf_assert_same((IDATA)args[1], 1);
 
     return 0;
 }
 
 int start_proc(void *args) {
     hythread_thin_monitor_t *lockword_ptr = (hythread_thin_monitor_t*)((void**)args)[0];
-    int *ret =  (int*)args+1;
+    IDATA *ret =  (IDATA*)args+1;
     IDATA status;
         
     //wait to start

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_thin_monitor.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_thin_monitor.c?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_thin_monitor.c
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/test_native_thin_monitor.c
Thu Oct  5 17:03:39 2006
@@ -151,7 +151,7 @@
     hythread_suspend_enable();
     hythread_join(thread);
     
-    tf_assert_same((int)args[1], 1);
+    tf_assert_same((IDATA)args[1], 1);
     hythread_suspend_disable();
     status = hythread_thin_monitor_enter(&lockword_ptr);
     tf_assert_same(status, TM_ERROR_NONE);
@@ -177,7 +177,7 @@
 
 int start_proc(void *args) {
     hythread_thin_monitor_t *lockword_ptr = (hythread_thin_monitor_t*)((void**)args)[0];
-    int *ret =  (int*)args+1;
+    IDATA *ret =  (IDATA*)args+1;
     IDATA status;
     hythread_suspend_disable();    
     status = hythread_thin_monitor_enter(lockword_ptr);

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/utils/tm2vm.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/utils/tm2vm.c?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/utils/tm2vm.c (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/tests/unit/thread/utils/tm2vm.c Thu Oct  5 17:03:39
2006
@@ -61,7 +61,7 @@
 IDATA jthread_throw_exception(char* name, char* message) {
     return 0;
 }
-VMEXPORT int jthread_throw_exception_object(jobject object) {
+VMEXPORT IDATA jthread_throw_exception_object(jobject object) {
     return 0;
 }
 
@@ -90,10 +90,10 @@
 }
 //--------------------------------------------------------------------------------
 
-int vm_attach() {
+IDATA vm_attach() {
     return 0;
 }
-int vm_detach() {
+IDATA vm_detach() {
     return 0;
 }
 void jvmti_send_thread_start_end_event(int is_start) {

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp?view=diff&rev=453432&r1=453431&r2=453432
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_dasm.cpp Thu Oct  5 17:03:39
2006
@@ -68,9 +68,9 @@
 }
 
 #ifdef _IPF_
-static const char* get_reg_value(
+const char* InstructionDisassembler::get_reg_value(
     InstructionDisassembler::Register reg,
-    const Registers* pcontext)
+    const Registers* pcontext) const
 {
     assert(0);
     return NULL;
@@ -78,9 +78,9 @@
 
 #elif defined _EM64T_
 
-static const char* get_reg_value(
+const char* InstructionDisassembler::get_reg_value(
     InstructionDisassembler::Register reg,
-    const Registers* pcontext)
+    const Registers* pcontext) const
 {
     assert(0);
     return NULL;



Mime
View raw message