Changeset 58 for trunk/openjdk/hotspot/src/os_cpu

Timestamp:

Jul 15, 2010, 2:46:42 PM (15 years ago)

Author:

dmik

Message:

hotspot/src: Another big bunch of patches to make the windows code build with Odin32/GCC on OS/2.

File:

• trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp (modified) (9 diffs)

trunk/openjdk/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp

@@ -58 +58 @@
     if ( ThreadLocalStorage::get_thread_ptr_offset() == 0 ) {
       int thread_ptr_offset;
+#ifdef __EMX__
+      __asm__("leal %1, %%eax; "
+              "subl %%fs:0, %%eax; "
+              "movl %%eax, %0; "
+              : "=m"(thread_ptr_offset) : "m"(wrapperthread) : "%eax");
+#else
       __asm {
         lea eax, dword ptr wrapperthread;
@@ -63 +69 @@
         mov thread_ptr_offset, eax
       };
+#endif      
       ThreadLocalStorage::set_thread_ptr_offset(thread_ptr_offset);
     }
@@ -71 +78 @@
     else {
       int test_thread_ptr_offset;
+#ifdef __EMX__
+      __asm__("leal %1, %%eax; "
+              "subl %%fs:0, %%eax; "
+              "movl %%eax, %0; "
+              : "=m"(test_thread_ptr_offset) : "m"(wrapperthread) : "%eax");
+#else
       __asm {
         lea eax, dword ptr wrapperthread;
@@ -76 +89 @@
         mov test_thread_ptr_offset, eax
       };
+#endif
       assert(test_thread_ptr_offset == ThreadLocalStorage::get_thread_ptr_offset(),
              "thread pointer offset from SEH changed");
@@ -340 +354 @@
 intptr_t* _get_previous_fp() {
   intptr_t **frameptr;
+#ifdef __EMX__
+  __asm("movl %%ebp, %0" : "=m"(frameptr));
+#else
   __asm {
     mov frameptr, ebp
   };
+#endif  
   return *frameptr;
 }
@@ -423 +441 @@
 extern "C" int SafeFetch32 (int * adr, int Err) {
    int rv = Err ;
-   _try {
+   __try {
        rv = *((volatile int *) adr) ;
    } __except(EXCEPTION_EXECUTE_HANDLER) {
@@ -432 +450 @@
 extern "C" intptr_t SafeFetchN (intptr_t * adr, intptr_t Err) {
    intptr_t rv = Err ;
-   _try {
+   __try {
        rv = *((volatile intptr_t *) adr) ;
    } __except(EXCEPTION_EXECUTE_HANDLER) {
@@ -446 +464 @@
    // On systems that don't support pause a rep:nop
    // is executed as a nop.  The rep: prefix is ignored.
+#ifdef __EMX__
+   __asm__("pause; ");
+#else
    _asm {
       pause ;
    };
+#endif
    return 1 ;
 #endif // AMD64
@@ -457 +479 @@
 #ifndef AMD64
   int fpu_cntrl_word = StubRoutines::fpu_cntrl_wrd_std();
+#ifdef __EMX__
+  __asm__("fldcw %0; " : : "m"(fpu_cntrl_word));
+#else  
   __asm fldcw fpu_cntrl_word;
+#endif  
 #endif // !AMD64
 }