Changeset 35

Timestamp:

Jun 19, 2010, 6:36:10 PM (15 years ago)

Author:

dmik

Message:

jdk/hpi: Port windows/monitor_md to EMX.

File:

• trunk/openjdk/jdk/src/windows/hpi/src/monitor_md.c (modified) (6 diffs)

trunk/openjdk/jdk/src/windows/hpi/src/monitor_md.c

@@ -104 +104 @@
  */
 
-static int __fastcall sysMonitorEnter2(sys_thread_t *self, sys_mon_t *mid)
+static EMXONLY(inline) int EMXNOP(__fastcall)
+sysMonitorEnter2(sys_thread_t *self, sys_mon_t *mid)
 {
     if (mid->semaphore == NULL) {
@@ -138 +139 @@
 sysMonitorEnter(sys_thread_t *self, sys_mon_t *mid)
 {
+#ifdef __EMX__
+    if (self == mid->monitor_owner) {
+        ++mid->entry_count;
+        return SYS_OK;
+    }
+
+    if (systemIsMP) {
+        register char isZero;
+        asm volatile (
+              "lock incl %0; sete %1"
+            : "=m" (mid->atomic_count), "=q" (isZero)
+            : "m" (mid->atomic_count)
+            : "memory"
+        );
+        if (isZero) {
+            mid->monitor_owner = self;
+            mid->entry_count = 1;
+            return SYS_OK;
+        }
+    } else {
+        if (!++mid->atomic_count) {
+            mid->monitor_owner = self;
+            mid->entry_count = 1;
+            return SYS_OK;
+        }
+    }
+
+    return sysMonitorEnter2(self, mid);
+#else /* __EMX__ */
     __asm
     {
@@ -177 +207 @@
         jmp  sysMonitorEnter2;
     }
+#endif /* __EMX__ */
 }
 #else
@@ -213 +244 @@
  */
 
-static int __fastcall
+static EMXONLY(inline) int EMXNOP(__fastcall)
 sysMonitorExit2(sys_thread_t *self, sys_mon_t *mid)
 {
@@ -237 +268 @@
 
 #ifndef _WIN64
-__declspec(naked) int __cdecl
+EMXNOP(__declspec(naked)) int EMXNOP(__cdecl)
 sysMonitorExit(sys_thread_t *self, sys_mon_t *mid)
 {
+#ifdef __EMX__
+    if (self != mid->monitor_owner)
+        return SYS_ERR;
+
+    if (--mid->entry_count)
+        return SYS_ERR;
+
+    mid->monitor_owner = 0;
+
+    if (systemIsMP) {
+        register char isLessThanZero;
+        asm volatile (
+              "lock decl %0; setge %1"
+            : "=m" (mid->atomic_count), "=q" (isLessThanZero)
+            : "m" (mid->atomic_count)
+            : "memory"
+        );
+        if (isLessThanZero)
+            return SYS_OK;
+    } else {
+        if (--mid->atomic_count < 0)
+            return SYS_OK;
+    }
+
+    return sysMonitorExit2(self, mid);
+#else /* __EMX__ */
     __asm
     {
@@ -277 +334 @@
         jmp sysMonitorExit2;        /* forwading call */
     }
+#endif /* __EMX__ */
 }
 #else