You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2006/11/14 14:52:10 UTC
svn commit: r474788 - in
/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64:
thrhelp.s thrspinlock.s
Author: gshimansky
Date: Tue Nov 14 05:52:09 2006
New Revision: 474788
URL: http://svn.apache.org/viewvc?view=rev&rev=474788
Log:
Applied HARMONY-2185 [classlib] Build on x86_64 fails because of assembly code
Since patch touches only x86_64 code, no testing was done on other platforms
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s
incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s
Modified: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s?view=diff&rev=474788&r1=474787&r2=474788
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s Tue Nov 14 05:52:09 2006
@@ -41,7 +41,7 @@
.type hythread_monitor_unpin,@function
.text
- .align 4
+ .align 8
current_stack_depth:
push %rbp
mov %rsp, %rbp
@@ -73,7 +73,7 @@
## Defined in: #THREAD Args: 2
.text
- .align 4
+ .align 8
hythread_monitor_pin:
push %rbp
mov %rsp, %rbp
@@ -98,7 +98,7 @@
## Defined in: #THREAD Args: 2
.text
- .align 4
+ .align 8
hythread_monitor_unpin:
push %rbp
mov %rsp, %rbp
Modified: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s?view=diff&rev=474788&r1=474787&r2=474788
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s Tue Nov 14 05:52:09 2006
@@ -42,7 +42,7 @@
## Defined in: #THREAD Args: 2
.text
- .align 4
+ .align 8
hythread_spinlock_acquire:
push %rbp
mov %rsp, %rbp
@@ -79,7 +79,7 @@
jnz .L3
mov %rcx, 64(%rsp) ## save VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
mov %rdx, 68(%rsp) ## save VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
- call hythread_yield
+ call hythread_yield@PLT
mov 64(%rsp), %rcx ## load VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
dec %rcx ## setFlags: true(Converted subtract 1 to dec)
mov 68(%rsp), %rdx ## load VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
@@ -100,7 +100,7 @@
## Defined in: #THREAD Args: 2
.text
- .align 4
+ .align 8
hythread_spinlock_swapState:
push %rbp
mov %rsp, %rbp