harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r478101 [5/5] - in /harmony/enhanced/classlib/trunk/modules: archive/src/main/native/archive/linux/ archive/src/main/native/archive/windows/ archive/src/main/native/zlib/linux/ archive/src/main/native/zlib/windows/ auth/src/main/native/auth...
Date Wed, 22 Nov 2006 09:37:41 GMT
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrhelp.s
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrhelp.s?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrhelp.s (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrhelp.s Wed Nov 22 01:37:36 2006
@@ -1,123 +1,123 @@
-#  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.
-
-eq_hy_null = 0
-eq_HyThreadMonitor_pinCount = 28
-eq_pointer_size = 4
-eqS_current_stack_depth = 16
-eqS_hythread_monitor_pin = 16
-eqS_hythread_monitor_unpin = 16
-eqSR_current_stack_depth = 4
-eqSR_hythread_monitor_pin = 4
-eqSR_hythread_monitor_unpin = 4
-eqSRS_current_stack_depth = 16
-eqSRS_hythread_monitor_pin = 16
-eqSRS_hythread_monitor_unpin = 16
-eqSS_current_stack_depth = 64
-eqSS_hythread_monitor_pin = 64
-eqSS_hythread_monitor_unpin = 64
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-       	#CODE32 ends
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-        .globl hythread_monitor_pin
-        .type hythread_monitor_pin,@function
-        .globl current_stack_depth
-        .type current_stack_depth,@function
-        .globl hythread_monitor_unpin
-        .type hythread_monitor_unpin,@function
-
-        .text
-        .align 4
-current_stack_depth:
-        push %ebp
-        mov %esp, %ebp
-        push %esi
-        push %edi
-        push %ebx
-        sub $64, %esp
-        movl %ebp, %ebx
-        jmp .L2
-.L1:
-        movl %ecx, %ebx
-.L2:
-        movl (%ebx), %ecx
-        testl %ecx, %ecx                         ## setFlags: true
-        jnz .L1
-        subl %ebp, %ebx
-        movl %ebx, %ecx
-        movl %ebx, %eax                          ## RegReg opt
-        add $64, %esp
-        pop %ebx
-        pop %edi
-        pop %esi
-        pop %ebp
-        ret
-END_current_stack_depth:
-        .size current_stack_depth,END_current_stack_depth - current_stack_depth
-
-## Prototype: void hythread_monitor_pin( hythread_monitor_t monitor, hythread_t osThread);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 4
-hythread_monitor_pin:
-        push %ebp
-        mov %esp, %ebp
-        push %esi
-        push %edi
-        push %ebx
-        sub $64, %esp
-        movl (eqSRS_hythread_monitor_pin+0+8+eqSS_hythread_monitor_pin)(%esp), %ebx
-        movl (eqSRS_hythread_monitor_pin+0+4+eqSS_hythread_monitor_pin)(%esp), %ebx
-        lock 
-        incl eq_HyThreadMonitor_pinCount(%ebx)   ##  (Converted add 1 to inc)
-        add $64, %esp
-        pop %ebx
-        pop %edi
-        pop %esi
-        pop %ebp
-        ret
-END_hythread_monitor_pin:
-        .size hythread_monitor_pin,END_hythread_monitor_pin - hythread_monitor_pin
-
-## Prototype: void hythread_monitor_unpin( hythread_monitor_t monitor, hythread_t osThread);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 4
-hythread_monitor_unpin:
-        push %ebp
-        mov %esp, %ebp
-        push %esi
-        push %edi
-        push %ebx
-        sub $64, %esp
-        movl (eqSS_hythread_monitor_unpin+0+8+eqSRS_hythread_monitor_unpin)(%esp), %ebx
-        movl (eqSS_hythread_monitor_unpin+0+eqSRS_hythread_monitor_unpin+4)(%esp), %ebx
-        lock 
-        decl eq_HyThreadMonitor_pinCount(%ebx)   ##  (Converted subtract 1 to dec)
-        add $64, %esp
-        pop %ebx
-        pop %edi
-        pop %esi
-        pop %ebp
-        ret
-END_hythread_monitor_unpin:
-        .size hythread_monitor_unpin,END_hythread_monitor_unpin - hythread_monitor_unpin
-
-       	#CODE32 ends
-        # end of file
+#  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.
+
+eq_hy_null = 0
+eq_HyThreadMonitor_pinCount = 28
+eq_pointer_size = 4
+eqS_current_stack_depth = 16
+eqS_hythread_monitor_pin = 16
+eqS_hythread_monitor_unpin = 16
+eqSR_current_stack_depth = 4
+eqSR_hythread_monitor_pin = 4
+eqSR_hythread_monitor_unpin = 4
+eqSRS_current_stack_depth = 16
+eqSRS_hythread_monitor_pin = 16
+eqSRS_hythread_monitor_unpin = 16
+eqSS_current_stack_depth = 64
+eqSS_hythread_monitor_pin = 64
+eqSS_hythread_monitor_unpin = 64
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+       	#CODE32 ends
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+        .globl hythread_monitor_pin
+        .type hythread_monitor_pin,@function
+        .globl current_stack_depth
+        .type current_stack_depth,@function
+        .globl hythread_monitor_unpin
+        .type hythread_monitor_unpin,@function
+
+        .text
+        .align 4
+current_stack_depth:
+        push %ebp
+        mov %esp, %ebp
+        push %esi
+        push %edi
+        push %ebx
+        sub $64, %esp
+        movl %ebp, %ebx
+        jmp .L2
+.L1:
+        movl %ecx, %ebx
+.L2:
+        movl (%ebx), %ecx
+        testl %ecx, %ecx                         ## setFlags: true
+        jnz .L1
+        subl %ebp, %ebx
+        movl %ebx, %ecx
+        movl %ebx, %eax                          ## RegReg opt
+        add $64, %esp
+        pop %ebx
+        pop %edi
+        pop %esi
+        pop %ebp
+        ret
+END_current_stack_depth:
+        .size current_stack_depth,END_current_stack_depth - current_stack_depth
+
+## Prototype: void hythread_monitor_pin( hythread_monitor_t monitor, hythread_t osThread);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 4
+hythread_monitor_pin:
+        push %ebp
+        mov %esp, %ebp
+        push %esi
+        push %edi
+        push %ebx
+        sub $64, %esp
+        movl (eqSRS_hythread_monitor_pin+0+8+eqSS_hythread_monitor_pin)(%esp), %ebx
+        movl (eqSRS_hythread_monitor_pin+0+4+eqSS_hythread_monitor_pin)(%esp), %ebx
+        lock 
+        incl eq_HyThreadMonitor_pinCount(%ebx)   ##  (Converted add 1 to inc)
+        add $64, %esp
+        pop %ebx
+        pop %edi
+        pop %esi
+        pop %ebp
+        ret
+END_hythread_monitor_pin:
+        .size hythread_monitor_pin,END_hythread_monitor_pin - hythread_monitor_pin
+
+## Prototype: void hythread_monitor_unpin( hythread_monitor_t monitor, hythread_t osThread);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 4
+hythread_monitor_unpin:
+        push %ebp
+        mov %esp, %ebp
+        push %esi
+        push %edi
+        push %ebx
+        sub $64, %esp
+        movl (eqSS_hythread_monitor_unpin+0+8+eqSRS_hythread_monitor_unpin)(%esp), %ebx
+        movl (eqSS_hythread_monitor_unpin+0+eqSRS_hythread_monitor_unpin+4)(%esp), %ebx
+        lock 
+        decl eq_HyThreadMonitor_pinCount(%ebx)   ##  (Converted subtract 1 to dec)
+        add $64, %esp
+        pop %ebx
+        pop %edi
+        pop %esi
+        pop %ebp
+        ret
+END_hythread_monitor_unpin:
+        .size hythread_monitor_unpin,END_hythread_monitor_unpin - hythread_monitor_unpin
+
+       	#CODE32 ends
+        # end of file

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrhelp.s
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrspinlock.s
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrspinlock.s?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrspinlock.s (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrspinlock.s Wed Nov 22 01:37:36 2006
@@ -1,132 +1,132 @@
-#  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.
-
-eq_HyThreadAbstractMonitor_spinCount1 = 48
-eq_HyThreadAbstractMonitor_spinCount2 = 52
-eq_HyThreadAbstractMonitor_spinCount3 = 56
-eq_HyThreadAbstractMonitor_spinlockState = 40
-eq_pointer_size = 4
-eqS_hythread_spinlock_acquire = 18
-eqS_hythread_spinlock_swapState = 16
-eqSR_hythread_spinlock_acquire = 4
-eqSR_hythread_spinlock_swapState = 4
-eqSRS_hythread_spinlock_acquire = 16
-eqSRS_hythread_spinlock_swapState = 16
-eqSS_hythread_spinlock_acquire = 72
-eqSS_hythread_spinlock_swapState = 64
-HYTHREAD_MONITOR_SPINLOCK_OWNED = 1
-HYTHREAD_MONITOR_SPINLOCK_UNOWNED = 0
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-       	#CODE32 ends
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-        .globl hythread_yield # an extern
-        .globl hythread_spinlock_acquire
-        .type hythread_spinlock_acquire,@function
-        .globl hythread_spinlock_swapState
-        .type hythread_spinlock_swapState,@function
-## Prototype: IDATA hythread_spinlock_acquire(hythread_t self, hythread_monitor_t monitor);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 4
-hythread_spinlock_acquire:
-        push %ebp
-        mov %esp, %ebp
-        push %esi
-        push %edi
-        push %ebx
-        sub $72, %esp
-        movl (eqSS_hythread_spinlock_acquire+0+eqSRS_hythread_spinlock_acquire+8)(%esp), %edx
-        movl eq_HyThreadAbstractMonitor_spinCount3(%edx), %ecx
-.L2:
-        movl eq_HyThreadAbstractMonitor_spinCount2(%edx), %ebx
-.L3:
-## Try to cmpxchg 0 into the target field (-1 indicates free)
-        cmpl $HYTHREAD_MONITOR_SPINLOCK_UNOWNED, eq_HyThreadAbstractMonitor_spinlockState(%edx) ## setFlags: true
-        jne .L10
-        xor %eax, %eax
-        movl $HYTHREAD_MONITOR_SPINLOCK_OWNED, %esi
-        lock 
-        cmpxchgl %esi, eq_HyThreadAbstractMonitor_spinlockState(%edx)
-        testl %eax, %eax                         ## setFlags: true
-        jnz .L10
-        xor %ebx, %ebx
-        jmp .L1
-.L10:
-        .word 37107                              ## PAUSE
-## begin tight loop
-        movl eq_HyThreadAbstractMonitor_spinCount1(%edx), %eax
-.L11:
-## inside tight loop
-        decl %eax                                ## setFlags: true(Converted subtract 1 to dec)
-        jnz .L11
-## end tight loop
-        decl %ebx                                ## setFlags: true(Converted subtract 1 to dec)
-        jnz .L3
-        movl %ecx, 64(%esp)                      ## save VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
-        movl %edx, 68(%esp)                      ## save VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
-        call hythread_yield
-        movl 64(%esp), %ecx                      ## load VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
-        decl %ecx                                ## setFlags: true(Converted subtract 1 to dec)
-        movl 68(%esp), %edx                      ## load VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
-        jnz .L2
-        movl $-1, %ebx
-.L1:
-        movl %ebx, %eax
-        add $72, %esp
-        pop %ebx
-        pop %edi
-        pop %esi
-        pop %ebp
-        ret
-END_hythread_spinlock_acquire:
-        .size hythread_spinlock_acquire,END_hythread_spinlock_acquire - hythread_spinlock_acquire
-
-## Prototype: UDATA hythread_spinlock_swapState(hythread_monitor_t monitor, UDATA newState);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 4
-hythread_spinlock_swapState:
-        push %ebp
-        mov %esp, %ebp
-        push %esi
-        push %edi
-        push %ebx
-        sub $64, %esp
-        movl (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+4)(%esp), %ebx
-        movl (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+8)(%esp), %ecx
-## If we are writing in UNOWNED, we are exiting the critical section, therefore
-## have to finish up any writes
-        testl %ecx, %ecx                         ## setFlags: true
-        ## memory barrier (no code necessary for write barriers)
-        xchgl %ecx, eq_HyThreadAbstractMonitor_spinlockState(%ebx)
-## if we entered the critical section, (i.e. we swapped out UNOWNED) then
-## we have to issue a readBarrier
-        testl %ecx, %ecx                         ## setFlags: true
-        movl %ecx, %eax
-        add $64, %esp
-        pop %ebx
-        pop %edi
-        pop %esi
-        pop %ebp
-        ret
-END_hythread_spinlock_swapState:
-        .size hythread_spinlock_swapState,END_hythread_spinlock_swapState - hythread_spinlock_swapState
-
-       	#CODE32 ends
-        # end of file
+#  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.
+
+eq_HyThreadAbstractMonitor_spinCount1 = 48
+eq_HyThreadAbstractMonitor_spinCount2 = 52
+eq_HyThreadAbstractMonitor_spinCount3 = 56
+eq_HyThreadAbstractMonitor_spinlockState = 40
+eq_pointer_size = 4
+eqS_hythread_spinlock_acquire = 18
+eqS_hythread_spinlock_swapState = 16
+eqSR_hythread_spinlock_acquire = 4
+eqSR_hythread_spinlock_swapState = 4
+eqSRS_hythread_spinlock_acquire = 16
+eqSRS_hythread_spinlock_swapState = 16
+eqSS_hythread_spinlock_acquire = 72
+eqSS_hythread_spinlock_swapState = 64
+HYTHREAD_MONITOR_SPINLOCK_OWNED = 1
+HYTHREAD_MONITOR_SPINLOCK_UNOWNED = 0
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+       	#CODE32 ends
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+        .globl hythread_yield # an extern
+        .globl hythread_spinlock_acquire
+        .type hythread_spinlock_acquire,@function
+        .globl hythread_spinlock_swapState
+        .type hythread_spinlock_swapState,@function
+## Prototype: IDATA hythread_spinlock_acquire(hythread_t self, hythread_monitor_t monitor);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 4
+hythread_spinlock_acquire:
+        push %ebp
+        mov %esp, %ebp
+        push %esi
+        push %edi
+        push %ebx
+        sub $72, %esp
+        movl (eqSS_hythread_spinlock_acquire+0+eqSRS_hythread_spinlock_acquire+8)(%esp), %edx
+        movl eq_HyThreadAbstractMonitor_spinCount3(%edx), %ecx
+.L2:
+        movl eq_HyThreadAbstractMonitor_spinCount2(%edx), %ebx
+.L3:
+## Try to cmpxchg 0 into the target field (-1 indicates free)
+        cmpl $HYTHREAD_MONITOR_SPINLOCK_UNOWNED, eq_HyThreadAbstractMonitor_spinlockState(%edx) ## setFlags: true
+        jne .L10
+        xor %eax, %eax
+        movl $HYTHREAD_MONITOR_SPINLOCK_OWNED, %esi
+        lock 
+        cmpxchgl %esi, eq_HyThreadAbstractMonitor_spinlockState(%edx)
+        testl %eax, %eax                         ## setFlags: true
+        jnz .L10
+        xor %ebx, %ebx
+        jmp .L1
+.L10:
+        .word 37107                              ## PAUSE
+## begin tight loop
+        movl eq_HyThreadAbstractMonitor_spinCount1(%edx), %eax
+.L11:
+## inside tight loop
+        decl %eax                                ## setFlags: true(Converted subtract 1 to dec)
+        jnz .L11
+## end tight loop
+        decl %ebx                                ## setFlags: true(Converted subtract 1 to dec)
+        jnz .L3
+        movl %ecx, 64(%esp)                      ## save VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
+        movl %edx, 68(%esp)                      ## save VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
+        call hythread_yield
+        movl 64(%esp), %ecx                      ## load VMtemp3_1_3_(HyThreadAbstractMonitor->spinCount3)
+        decl %ecx                                ## setFlags: true(Converted subtract 1 to dec)
+        movl 68(%esp), %edx                      ## load VMtemp3_1_2_(struct HyThreadAbstractMonitor*) in_HyVMThreadSpinlocks>>#hythread_spinlock_acquire
+        jnz .L2
+        movl $-1, %ebx
+.L1:
+        movl %ebx, %eax
+        add $72, %esp
+        pop %ebx
+        pop %edi
+        pop %esi
+        pop %ebp
+        ret
+END_hythread_spinlock_acquire:
+        .size hythread_spinlock_acquire,END_hythread_spinlock_acquire - hythread_spinlock_acquire
+
+## Prototype: UDATA hythread_spinlock_swapState(hythread_monitor_t monitor, UDATA newState);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 4
+hythread_spinlock_swapState:
+        push %ebp
+        mov %esp, %ebp
+        push %esi
+        push %edi
+        push %ebx
+        sub $64, %esp
+        movl (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+4)(%esp), %ebx
+        movl (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+8)(%esp), %ecx
+## If we are writing in UNOWNED, we are exiting the critical section, therefore
+## have to finish up any writes
+        testl %ecx, %ecx                         ## setFlags: true
+        ## memory barrier (no code necessary for write barriers)
+        xchgl %ecx, eq_HyThreadAbstractMonitor_spinlockState(%ebx)
+## if we entered the critical section, (i.e. we swapped out UNOWNED) then
+## we have to issue a readBarrier
+        testl %ecx, %ecx                         ## setFlags: true
+        movl %ecx, %eax
+        add $64, %esp
+        pop %ebx
+        pop %edi
+        pop %esi
+        pop %ebp
+        ret
+END_hythread_spinlock_swapState:
+        .size hythread_spinlock_swapState,END_hythread_spinlock_swapState - hythread_spinlock_swapState
+
+       	#CODE32 ends
+        # end of file

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86/thrspinlock.s
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s Wed Nov 22 01:37:36 2006
@@ -1,123 +1,123 @@
-#  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.
-
-eq_hy_null = 0
-eq_HyThreadMonitor_pinCount = 28
-eq_pointer_size = 4
-eqS_current_stack_depth = 16
-eqS_hythread_monitor_pin = 16
-eqS_hythread_monitor_unpin = 16
-eqSR_current_stack_depth = 4
-eqSR_hythread_monitor_pin = 4
-eqSR_hythread_monitor_unpin = 4
-eqSRS_current_stack_depth = 16
-eqSRS_hythread_monitor_pin = 16
-eqSRS_hythread_monitor_unpin = 16
-eqSS_current_stack_depth = 64
-eqSS_hythread_monitor_pin = 64
-eqSS_hythread_monitor_unpin = 64
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-       	#CODE32 ends
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-        .globl hythread_monitor_pin
-        .type hythread_monitor_pin,@function
-        .globl current_stack_depth
-        .type current_stack_depth,@function
-        .globl hythread_monitor_unpin
-        .type hythread_monitor_unpin,@function
-
-        .text
-        .align 8
-current_stack_depth:
-        push %rbp
-        mov %rsp, %rbp
-        push %rsi
-        push %rdi
-        push %rbx
-        sub $64, %rsp
-        mov %rbp, %rbx
-        jmp .L2
-.L1:
-        mov %rcx, %rbx
-.L2:
-        mov (%rbx), %rcx
-        test %rcx, %rcx                         ## setFlags: true
-        jnz .L1
-        sub %rbp, %rbx
-        mov %rbx, %rcx
-        mov %rbx, %rax                          ## RegReg opt
-        add $64, %rsp
-        pop %rbx
-        pop %rdi
-        pop %rsi
-        pop %rbp
-        ret
-END_current_stack_depth:
-        .size current_stack_depth,END_current_stack_depth - current_stack_depth
-
-## Prototype: void hythread_monitor_pin( hythread_monitor_t monitor, hythread_t osThread);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 8
-hythread_monitor_pin:
-        push %rbp
-        mov %rsp, %rbp
-        push %rsi
-        push %rdi
-        push %rbx
-        sub $64, %rsp
-        mov (eqSRS_hythread_monitor_pin+0+8+eqSS_hythread_monitor_pin)(%rsp), %rbx
-        mov (eqSRS_hythread_monitor_pin+0+4+eqSS_hythread_monitor_pin)(%rsp), %rbx
-        lock 
-        incl eq_HyThreadMonitor_pinCount(%rbx)   ##  (Converted add 1 to inc)
-        add $64, %rsp
-        pop %rbx
-        pop %rdi
-        pop %rsi
-        pop %rbp
-        ret
-END_hythread_monitor_pin:
-        .size hythread_monitor_pin,END_hythread_monitor_pin - hythread_monitor_pin
-
-## Prototype: void hythread_monitor_unpin( hythread_monitor_t monitor, hythread_t osThread);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 8
-hythread_monitor_unpin:
-        push %rbp
-        mov %rsp, %rbp
-        push %rsi
-        push %rdi
-        push %rbx
-        sub $64, %rsp
-        mov (eqSS_hythread_monitor_unpin+0+8+eqSRS_hythread_monitor_unpin)(%rsp), %rbx
-        mov (eqSS_hythread_monitor_unpin+0+eqSRS_hythread_monitor_unpin+4)(%rsp), %rbx
-        lock 
-        decl eq_HyThreadMonitor_pinCount(%rbx)   ##  (Converted subtract 1 to dec)
-        add $64, %rsp
-        pop %rbx
-        pop %rdi
-        pop %rsi
-        pop %rbp
-        ret
-END_hythread_monitor_unpin:
-        .size hythread_monitor_unpin,END_hythread_monitor_unpin - hythread_monitor_unpin
-
-       	#CODE32 ends
-        # end of file
+#  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.
+
+eq_hy_null = 0
+eq_HyThreadMonitor_pinCount = 28
+eq_pointer_size = 4
+eqS_current_stack_depth = 16
+eqS_hythread_monitor_pin = 16
+eqS_hythread_monitor_unpin = 16
+eqSR_current_stack_depth = 4
+eqSR_hythread_monitor_pin = 4
+eqSR_hythread_monitor_unpin = 4
+eqSRS_current_stack_depth = 16
+eqSRS_hythread_monitor_pin = 16
+eqSRS_hythread_monitor_unpin = 16
+eqSS_current_stack_depth = 64
+eqSS_hythread_monitor_pin = 64
+eqSS_hythread_monitor_unpin = 64
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+       	#CODE32 ends
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+        .globl hythread_monitor_pin
+        .type hythread_monitor_pin,@function
+        .globl current_stack_depth
+        .type current_stack_depth,@function
+        .globl hythread_monitor_unpin
+        .type hythread_monitor_unpin,@function
+
+        .text
+        .align 8
+current_stack_depth:
+        push %rbp
+        mov %rsp, %rbp
+        push %rsi
+        push %rdi
+        push %rbx
+        sub $64, %rsp
+        mov %rbp, %rbx
+        jmp .L2
+.L1:
+        mov %rcx, %rbx
+.L2:
+        mov (%rbx), %rcx
+        test %rcx, %rcx                         ## setFlags: true
+        jnz .L1
+        sub %rbp, %rbx
+        mov %rbx, %rcx
+        mov %rbx, %rax                          ## RegReg opt
+        add $64, %rsp
+        pop %rbx
+        pop %rdi
+        pop %rsi
+        pop %rbp
+        ret
+END_current_stack_depth:
+        .size current_stack_depth,END_current_stack_depth - current_stack_depth
+
+## Prototype: void hythread_monitor_pin( hythread_monitor_t monitor, hythread_t osThread);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 8
+hythread_monitor_pin:
+        push %rbp
+        mov %rsp, %rbp
+        push %rsi
+        push %rdi
+        push %rbx
+        sub $64, %rsp
+        mov (eqSRS_hythread_monitor_pin+0+8+eqSS_hythread_monitor_pin)(%rsp), %rbx
+        mov (eqSRS_hythread_monitor_pin+0+4+eqSS_hythread_monitor_pin)(%rsp), %rbx
+        lock 
+        incl eq_HyThreadMonitor_pinCount(%rbx)   ##  (Converted add 1 to inc)
+        add $64, %rsp
+        pop %rbx
+        pop %rdi
+        pop %rsi
+        pop %rbp
+        ret
+END_hythread_monitor_pin:
+        .size hythread_monitor_pin,END_hythread_monitor_pin - hythread_monitor_pin
+
+## Prototype: void hythread_monitor_unpin( hythread_monitor_t monitor, hythread_t osThread);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 8
+hythread_monitor_unpin:
+        push %rbp
+        mov %rsp, %rbp
+        push %rsi
+        push %rdi
+        push %rbx
+        sub $64, %rsp
+        mov (eqSS_hythread_monitor_unpin+0+8+eqSRS_hythread_monitor_unpin)(%rsp), %rbx
+        mov (eqSS_hythread_monitor_unpin+0+eqSRS_hythread_monitor_unpin+4)(%rsp), %rbx
+        lock 
+        decl eq_HyThreadMonitor_pinCount(%rbx)   ##  (Converted subtract 1 to dec)
+        add $64, %rsp
+        pop %rbx
+        pop %rdi
+        pop %rsi
+        pop %rbp
+        ret
+END_hythread_monitor_unpin:
+        .size hythread_monitor_unpin,END_hythread_monitor_unpin - hythread_monitor_unpin
+
+       	#CODE32 ends
+        # end of file

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrhelp.s
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s Wed Nov 22 01:37:36 2006
@@ -1,132 +1,132 @@
-#  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.
-
-eq_HyThreadAbstractMonitor_spinCount1 = 48
-eq_HyThreadAbstractMonitor_spinCount2 = 52
-eq_HyThreadAbstractMonitor_spinCount3 = 56
-eq_HyThreadAbstractMonitor_spinlockState = 40
-eq_pointer_size = 4
-eqS_hythread_spinlock_acquire = 18
-eqS_hythread_spinlock_swapState = 16
-eqSR_hythread_spinlock_acquire = 4
-eqSR_hythread_spinlock_swapState = 4
-eqSRS_hythread_spinlock_acquire = 16
-eqSRS_hythread_spinlock_swapState = 16
-eqSS_hythread_spinlock_acquire = 72
-eqSS_hythread_spinlock_swapState = 64
-HYTHREAD_MONITOR_SPINLOCK_OWNED = 1
-HYTHREAD_MONITOR_SPINLOCK_UNOWNED = 0
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-       	#CODE32 ends
-       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
-       	#assume cs:flat,ds:flat,ss:flat
-        .globl hythread_yield # an extern
-        .globl hythread_spinlock_acquire
-        .type hythread_spinlock_acquire,@function
-        .globl hythread_spinlock_swapState
-        .type hythread_spinlock_swapState,@function
-## Prototype: IDATA hythread_spinlock_acquire(hythread_t self, hythread_monitor_t monitor);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 8
-hythread_spinlock_acquire:
-        push %rbp
-        mov %rsp, %rbp
-        push %rsi
-        push %rdi
-        push %rbx
-        sub $72, %rsp
-        mov (eqSS_hythread_spinlock_acquire+0+eqSRS_hythread_spinlock_acquire+8)(%rsp), %rdx
-        mov eq_HyThreadAbstractMonitor_spinCount3(%rdx), %rcx
-.L2:
-        mov eq_HyThreadAbstractMonitor_spinCount2(%rdx), %rbx
-.L3:
-## Try to cmpxchg 0 into the target field (-1 indicates free)
-        cmpl $HYTHREAD_MONITOR_SPINLOCK_UNOWNED, eq_HyThreadAbstractMonitor_spinlockState(%rdx) ## setFlags: true
-        jne .L10
-        xor %rax, %rax
-        mov $HYTHREAD_MONITOR_SPINLOCK_OWNED, %rsi
-        lock 
-        cmpxchg %rsi, eq_HyThreadAbstractMonitor_spinlockState(%rdx)
-        test %rax, %rax                         ## setFlags: true
-        jnz .L10
-        xor %rbx, %rbx
-        jmp .L1
-.L10:
-        .word 37107                              ## PAUSE
-## begin tight loop
-        mov eq_HyThreadAbstractMonitor_spinCount1(%rdx), %rax
-.L11:
-## inside tight loop
-        dec %rax                                ## setFlags: true(Converted subtract 1 to dec)
-        jnz .L11
-## end tight loop
-        dec %rbx                                ## setFlags: true(Converted subtract 1 to dec)
-        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@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
-        jnz .L2
-        mov $-1, %rbx
-.L1:
-        mov %rbx, %rax
-        add $72, %rsp
-        pop %rbx
-        pop %rdi
-        pop %rsi
-        pop %rbp
-        ret
-END_hythread_spinlock_acquire:
-        .size hythread_spinlock_acquire,END_hythread_spinlock_acquire - hythread_spinlock_acquire
-
-## Prototype: UDATA hythread_spinlock_swapState(hythread_monitor_t monitor, UDATA newState);
-## Defined in: #THREAD Args: 2
-
-        .text
-        .align 8
-hythread_spinlock_swapState:
-        push %rbp
-        mov %rsp, %rbp
-        push %rsi
-        push %rdi
-        push %rbx
-        sub $64, %rsp
-        mov (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+4)(%rsp), %rbx
-        mov (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+8)(%rsp), %rcx
-## If we are writing in UNOWNED, we are exiting the critical section, therefore
-## have to finish up any writes
-        test %rcx, %rcx                         ## setFlags: true
-        ## memory barrier (no code necessary for write barriers)
-        xchg %rcx, eq_HyThreadAbstractMonitor_spinlockState(%rbx)
-## if we entered the critical section, (i.e. we swapped out UNOWNED) then
-## we have to issue a readBarrier
-        test %rcx, %rcx                         ## setFlags: true
-        mov %rcx, %rax
-        add $64, %rsp
-        pop %rbx
-        pop %rdi
-        pop %rsi
-        pop %rbp
-        ret
-END_hythread_spinlock_swapState:
-        .size hythread_spinlock_swapState,END_hythread_spinlock_swapState - hythread_spinlock_swapState
-
-       	#CODE32 ends
-        # end of file
+#  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.
+
+eq_HyThreadAbstractMonitor_spinCount1 = 48
+eq_HyThreadAbstractMonitor_spinCount2 = 52
+eq_HyThreadAbstractMonitor_spinCount3 = 56
+eq_HyThreadAbstractMonitor_spinlockState = 40
+eq_pointer_size = 4
+eqS_hythread_spinlock_acquire = 18
+eqS_hythread_spinlock_swapState = 16
+eqSR_hythread_spinlock_acquire = 4
+eqSR_hythread_spinlock_swapState = 4
+eqSRS_hythread_spinlock_acquire = 16
+eqSRS_hythread_spinlock_swapState = 16
+eqSS_hythread_spinlock_acquire = 72
+eqSS_hythread_spinlock_swapState = 64
+HYTHREAD_MONITOR_SPINLOCK_OWNED = 1
+HYTHREAD_MONITOR_SPINLOCK_UNOWNED = 0
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+       	#CODE32 ends
+       	#CODE32 SEGMENT FLAT PUBLIC 'CODE'
+       	#assume cs:flat,ds:flat,ss:flat
+        .globl hythread_yield # an extern
+        .globl hythread_spinlock_acquire
+        .type hythread_spinlock_acquire,@function
+        .globl hythread_spinlock_swapState
+        .type hythread_spinlock_swapState,@function
+## Prototype: IDATA hythread_spinlock_acquire(hythread_t self, hythread_monitor_t monitor);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 8
+hythread_spinlock_acquire:
+        push %rbp
+        mov %rsp, %rbp
+        push %rsi
+        push %rdi
+        push %rbx
+        sub $72, %rsp
+        mov (eqSS_hythread_spinlock_acquire+0+eqSRS_hythread_spinlock_acquire+8)(%rsp), %rdx
+        mov eq_HyThreadAbstractMonitor_spinCount3(%rdx), %rcx
+.L2:
+        mov eq_HyThreadAbstractMonitor_spinCount2(%rdx), %rbx
+.L3:
+## Try to cmpxchg 0 into the target field (-1 indicates free)
+        cmpl $HYTHREAD_MONITOR_SPINLOCK_UNOWNED, eq_HyThreadAbstractMonitor_spinlockState(%rdx) ## setFlags: true
+        jne .L10
+        xor %rax, %rax
+        mov $HYTHREAD_MONITOR_SPINLOCK_OWNED, %rsi
+        lock 
+        cmpxchg %rsi, eq_HyThreadAbstractMonitor_spinlockState(%rdx)
+        test %rax, %rax                         ## setFlags: true
+        jnz .L10
+        xor %rbx, %rbx
+        jmp .L1
+.L10:
+        .word 37107                              ## PAUSE
+## begin tight loop
+        mov eq_HyThreadAbstractMonitor_spinCount1(%rdx), %rax
+.L11:
+## inside tight loop
+        dec %rax                                ## setFlags: true(Converted subtract 1 to dec)
+        jnz .L11
+## end tight loop
+        dec %rbx                                ## setFlags: true(Converted subtract 1 to dec)
+        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@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
+        jnz .L2
+        mov $-1, %rbx
+.L1:
+        mov %rbx, %rax
+        add $72, %rsp
+        pop %rbx
+        pop %rdi
+        pop %rsi
+        pop %rbp
+        ret
+END_hythread_spinlock_acquire:
+        .size hythread_spinlock_acquire,END_hythread_spinlock_acquire - hythread_spinlock_acquire
+
+## Prototype: UDATA hythread_spinlock_swapState(hythread_monitor_t monitor, UDATA newState);
+## Defined in: #THREAD Args: 2
+
+        .text
+        .align 8
+hythread_spinlock_swapState:
+        push %rbp
+        mov %rsp, %rbp
+        push %rsi
+        push %rdi
+        push %rbx
+        sub $64, %rsp
+        mov (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+4)(%rsp), %rbx
+        mov (eqSS_hythread_spinlock_swapState+0+eqSRS_hythread_spinlock_swapState+8)(%rsp), %rcx
+## If we are writing in UNOWNED, we are exiting the critical section, therefore
+## have to finish up any writes
+        test %rcx, %rcx                         ## setFlags: true
+        ## memory barrier (no code necessary for write barriers)
+        xchg %rcx, eq_HyThreadAbstractMonitor_spinlockState(%rbx)
+## if we entered the critical section, (i.e. we swapped out UNOWNED) then
+## we have to issue a readBarrier
+        test %rcx, %rcx                         ## setFlags: true
+        mov %rcx, %rax
+        add $64, %rsp
+        pop %rbx
+        pop %rdi
+        pop %rsi
+        pop %rbp
+        ret
+END_hythread_spinlock_swapState:
+        .size hythread_spinlock_swapState,END_hythread_spinlock_swapState - hythread_spinlock_swapState
+
+       	#CODE32 ends
+        # end of file

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/x86_64/thrspinlock.s
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/hythr.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/hythr.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/hythr.def (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/hythr.def Wed Nov 22 01:37:36 2006
@@ -1,84 +1,84 @@
-LIBRARY	HYTHR
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
-	hythread_attach
-	hythread_create
-	hythread_cancel
-	hythread_interrupt
-	hythread_clear_interrupted
-	hythread_interrupted
-	hythread_priority_interrupt
-	hythread_clear_priority_interrupted
-	hythread_priority_interrupted
-	hythread_monitor_destroy
-	hythread_monitor_enter
-	hythread_monitor_get_name
-	hythread_monitor_enter_using_threadId
-	hythread_monitor_try_enter
-	hythread_monitor_try_enter_using_threadId
-	hythread_monitor_exit
-	hythread_monitor_exit_using_threadId
-	hythread_monitor_init
-	hythread_monitor_init_with_name
-	hythread_monitor_notify
-	hythread_monitor_notify_all
-	hythread_monitor_wait
-	hythread_monitor_wait_timed
-	hythread_monitor_wait_interruptable
-	hythread_monitor_num_waiting
-	hythread_resume
-	hythread_self
-	hythread_set_priority
-	hythread_get_priority
-	hythread_sleep
-	hythread_sleep_interruptable
-	hythread_suspend
-	hythread_tls_alloc
-	hythread_tls_alloc_with_finalizer
-	hythread_tls_free
-	hythread_tls_get
-	hythread_tls_set
-	hythread_yield
-	hythread_exit
-	hythread_detach
-	hythread_global
-	hythread_get_flags
-	hythread_monitor_walk
-	hythread_lib_lock
-	hythread_lib_unlock
-	hythread_rwmutex_init
-	hythread_rwmutex_destroy
-	hythread_rwmutex_enter_read
-	hythread_rwmutex_exit_read
-	hythread_rwmutex_enter_write
-	hythread_rwmutex_exit_write
-	hythread_park
-	hythread_unpark
-	hythread_monitor_lock
-	hythread_monitor_unlock
-	hythread_monitor_pin
-	hythread_monitor_unpin
-	hythread_lib_get_flags
-	hythread_lib_set_flags
-	hythread_lib_clear_flags
-	hythread_jlm_monitor_init
-	hythread_jlm_thread_init
-	hythread_jlm_gc_lock_init
-	hythread_jlm_get_gc_lock_tracing
-	hythread_monitor_get_tracing
-	hythread_get_user_time
-	hythread_get_cpu_time
-	hythread_get_handle
-	hythread_get_stack_size
-	hythread_get_os_priority
-	hythread_get_stack_usage
-	hythread_enable_stack_usage
-	hysem_init
-	hysem_post
-	hysem_wait
-	hysem_destroy
-
+LIBRARY	HYTHR
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS
+	hythread_attach
+	hythread_create
+	hythread_cancel
+	hythread_interrupt
+	hythread_clear_interrupted
+	hythread_interrupted
+	hythread_priority_interrupt
+	hythread_clear_priority_interrupted
+	hythread_priority_interrupted
+	hythread_monitor_destroy
+	hythread_monitor_enter
+	hythread_monitor_get_name
+	hythread_monitor_enter_using_threadId
+	hythread_monitor_try_enter
+	hythread_monitor_try_enter_using_threadId
+	hythread_monitor_exit
+	hythread_monitor_exit_using_threadId
+	hythread_monitor_init
+	hythread_monitor_init_with_name
+	hythread_monitor_notify
+	hythread_monitor_notify_all
+	hythread_monitor_wait
+	hythread_monitor_wait_timed
+	hythread_monitor_wait_interruptable
+	hythread_monitor_num_waiting
+	hythread_resume
+	hythread_self
+	hythread_set_priority
+	hythread_get_priority
+	hythread_sleep
+	hythread_sleep_interruptable
+	hythread_suspend
+	hythread_tls_alloc
+	hythread_tls_alloc_with_finalizer
+	hythread_tls_free
+	hythread_tls_get
+	hythread_tls_set
+	hythread_yield
+	hythread_exit
+	hythread_detach
+	hythread_global
+	hythread_get_flags
+	hythread_monitor_walk
+	hythread_lib_lock
+	hythread_lib_unlock
+	hythread_rwmutex_init
+	hythread_rwmutex_destroy
+	hythread_rwmutex_enter_read
+	hythread_rwmutex_exit_read
+	hythread_rwmutex_enter_write
+	hythread_rwmutex_exit_write
+	hythread_park
+	hythread_unpark
+	hythread_monitor_lock
+	hythread_monitor_unlock
+	hythread_monitor_pin
+	hythread_monitor_unpin
+	hythread_lib_get_flags
+	hythread_lib_set_flags
+	hythread_lib_clear_flags
+	hythread_jlm_monitor_init
+	hythread_jlm_thread_init
+	hythread_jlm_gc_lock_init
+	hythread_jlm_get_gc_lock_tracing
+	hythread_monitor_get_tracing
+	hythread_get_user_time
+	hythread_get_cpu_time
+	hythread_get_handle
+	hythread_get_stack_size
+	hythread_get_os_priority
+	hythread_get_stack_usage
+	hythread_enable_stack_usage
+	hysem_init
+	hysem_post
+	hysem_wait
+	hysem_destroy
+

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/hythr.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,41 +1,41 @@
-#  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.
-
-#
-# Makefile for module 'thread'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-LIBBASE=hythr
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-
-BUILDFILES = \
-  $(SHAREDSUB)thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj \
-  $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj \
-  $(SHAREDSUB)thrprof.obj
-
-# TOFIX $(LIBBASE).def should be a dependency on all libs
-VIRTFILES = $(LIBBASE).res
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
-
-MDLLIBFILES = $(LIBPATH)hypool.lib $(LIBPATH)hycommon.lib
-
-DLLBASE=0x11500000
-COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-
-!include <$(HY_HDK)\build\make\rules.mak>
+#  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.
+
+#
+# Makefile for module 'thread'
+#
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBBASE=hythr
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+
+BUILDFILES = \
+  $(SHAREDSUB)thread_copyright.obj thrhelp.obj thrspinlock.obj hythread.obj \
+  $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj \
+  $(SHAREDSUB)thrprof.obj
+
+# TOFIX $(LIBBASE).def should be a dependency on all libs
+VIRTFILES = $(LIBBASE).res
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 
+
+MDLLIBFILES = $(LIBPATH)hypool.lib $(LIBPATH)hycommon.lib
+
+DLLBASE=0x11500000
+COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.def (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.def Wed Nov 22 01:37:36 2006
@@ -1,15 +1,15 @@
-LIBRARY	HYPREFS
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
-	Java_java_util_prefs_RegistryPreferencesImpl_getValue
-	Java_java_util_prefs_RegistryPreferencesImpl_putValue
-	Java_java_util_prefs_RegistryPreferencesImpl_removeKey
-	Java_java_util_prefs_RegistryPreferencesImpl_keys
-	Java_java_util_prefs_RegistryPreferencesImpl_removeNode
-	Java_java_util_prefs_RegistryPreferencesImpl_getNode
-	Java_java_util_prefs_RegistryPreferencesImpl_getChildNames
-	Java_java_util_prefs_RegistryPreferencesImpl_flushPrefs
+LIBRARY	HYPREFS
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS
+	Java_java_util_prefs_RegistryPreferencesImpl_getValue
+	Java_java_util_prefs_RegistryPreferencesImpl_putValue
+	Java_java_util_prefs_RegistryPreferencesImpl_removeKey
+	Java_java_util_prefs_RegistryPreferencesImpl_keys
+	Java_java_util_prefs_RegistryPreferencesImpl_removeNode
+	Java_java_util_prefs_RegistryPreferencesImpl_getNode
+	Java_java_util_prefs_RegistryPreferencesImpl_getChildNames
+	Java_java_util_prefs_RegistryPreferencesImpl_flushPrefs

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.rc
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.rc?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.rc (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.rc Wed Nov 22 01:37:36 2006
@@ -1,47 +1,47 @@
-;
-; Copyright 1998, 2005 The Apache Software Foundation or its licensors, as applicable
-; 
-; Licensed 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.
-;
-
-#include <windows.h>
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040904b0"
-		BEGIN
-			VALUE "CompanyName", "The Apache Software Foundation.\0"
-			VALUE "FileDescription", "Prefs native code\0"
-			VALUE "FileVersion", "0.1\0"
-			VALUE "InternalName", "prefs\0"
-			VALUE "LegalCopyright", "(c) Copyright 2005 The Apache Software Foundation or its licensors, as applicable.\0"
-			VALUE "OriginalFilename", "hyprefs.dll\0"
-			VALUE "ProductName", "Apache Harmony\0"
-			VALUE "ProductVersion", "0.1\0"
-		END
-	END
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE "Translation", 0x0409, 1200
-	END
-END
+;
+; Copyright 1998, 2005 The Apache Software Foundation or its licensors, as applicable
+; 
+; Licensed 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.
+;
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "Prefs native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "prefs\0"
+			VALUE "LegalCopyright", "(c) Copyright 2005 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "hyprefs.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/hyprefs.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,41 +1,41 @@
-#  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.
-
-#
-# Makefile for module 'prefs'
-#
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-LIBBASE=hyprefs
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-
-BUILDFILES = prefs_copyright.obj PreferencesImpl.obj
-
-VIRTFILES = $(LIBBASE).res
-
-SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES = \
-	$(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
-        $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
-	$(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
-DLLBASE=0x13300000
-COMMENT=/comment:"Preferences component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-
-!include <$(HY_HDK)\build\make\rules.mak>
+#  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.
+
+#
+# Makefile for module 'prefs'
+#
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBBASE=hyprefs
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+BUILDFILES = prefs_copyright.obj PreferencesImpl.obj
+
+VIRTFILES = $(LIBBASE).res
+
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = \
+	$(LIBPATH)hycommon.lib $(LIBPATH)hysig.lib $(LIBPATH)hyzip.lib \
+        $(LIBPATH)hyzlib.lib $(LIBPATH)hypool.lib $(LIBPATH)hyfdlibm.lib \
+	$(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
+DLLBASE=0x13300000
+COMMENT=/comment:"Preferences component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile Wed Nov 22 01:37:36 2006
@@ -1,46 +1,46 @@
-# 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.
-
-!include <$(HY_HDK)\build\make\defines.mak>
-
-LIBBASE=print
-DLLNAME=..\$(LIBBASE).dll
-LIBNAME=$(LIBPATH)$(LIBBASE).lib
-HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-
-# TOFIX: fix warning so we can use default HYCFLAGS
-# That is:
-# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
-HYCFLAGS = \
-  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
-  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0500 -D_WINSOCKAPI_ -DWINVER=0x0500 \
-  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
-  -I$(SHAREDSUB)\include
-
-BUILDFILES = print.obj \
-ui.obj
-
-VIRTFILES = $(LIBBASE).res
-SYSLIBFILES = ws2_32.lib Iphlpapi.lib
-
-MDLLIBFILES = #\
-#  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
-#  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
-
-DLLBASE=0x13300000
-COMMENT=/comment:"Print native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
-
-!include <$(HY_HDK)\build\make\rules.mak>
-
+# 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.
+
+!include <$(HY_HDK)\build\make\defines.mak>
+
+LIBBASE=print
+DLLNAME=..\$(LIBBASE).dll
+LIBNAME=$(LIBPATH)$(LIBBASE).lib
+HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
+
+# TOFIX: fix warning so we can use default HYCFLAGS
+# That is:
+# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+HYCFLAGS = \
+  -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
+  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0500 -D_WINSOCKAPI_ -DWINVER=0x0500 \
+  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
+  -I$(SHAREDSUB)\include
+
+BUILDFILES = print.obj \
+ui.obj
+
+VIRTFILES = $(LIBBASE).res
+SYSLIBFILES = ws2_32.lib Iphlpapi.lib
+
+MDLLIBFILES = #\
+#  $(LIBPATH)hysig.lib $(LIBPATH)hycommon.lib $(LIBPATH)hypool.lib \
+#  $(LIBPATH)hythr.lib $(LIBPATH)vmi.lib $(JPEG_DIR)libjpeg.lib
+
+DLLBASE=0x13300000
+COMMENT=/comment:"Print native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
+
+!include <$(HY_HDK)\build\make\rules.mak>
+

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def Wed Nov 22 01:37:36 2006
@@ -1,7 +1,7 @@
-LIBRARY	JPEGENCODER
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
+LIBRARY	JPEGENCODER
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.def
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc Wed Nov 22 01:37:36 2006
@@ -1,48 +1,48 @@
-;
-; 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.
-;
-
-#include <windows.h>
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- FILEFLAGSMASK 0x3fL
- FILEFLAGS 0x0L
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040904b0"
-		BEGIN
-			VALUE "CompanyName", "The Apache Software Foundation.\0"
-			VALUE "FileDescription", "JPEG encoder native code\0"
-			VALUE "FileVersion", "0.1\0"
-			VALUE "InternalName", "jpegencoder\0"
-			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
-			VALUE "OriginalFilename", "jpegencoder.dll\0"
-			VALUE "ProductName", "Apache Harmony\0"
-			VALUE "ProductVersion", "0.1\0"
-		END
-	END
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE "Translation", 0x0409, 1200
-	END
-END
+;
+; 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.
+;
+
+#include <windows.h>
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,1,0,0
+ PRODUCTVERSION 0,1,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "CompanyName", "The Apache Software Foundation.\0"
+			VALUE "FileDescription", "JPEG encoder native code\0"
+			VALUE "FileVersion", "0.1\0"
+			VALUE "InternalName", "jpegencoder\0"
+			VALUE "LegalCopyright", "(c) Copyright 2006 The Apache Software Foundation or its licensors, as applicable.\0"
+			VALUE "OriginalFilename", "jpegencoder.dll\0"
+			VALUE "ProductName", "Apache Harmony\0"
+			VALUE "ProductVersion", "0.1\0"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x0409, 1200
+	END
+END

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/print.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/swing/src/main/java/common/javax/swing/plaf/metal/OceanTheme.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java/common/javax/swing/text/html/parser/DTDTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/libhytext.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/libhytext.exp?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/libhytext.exp (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/libhytext.exp Wed Nov 22 01:37:36 2006
@@ -1,15 +1,15 @@
-HYTEXT_0.1 {
-	global :		
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1close;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1countRuns;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getDirection;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLength;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLevels;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getParaLevel;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getRuns;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1open;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1reorderVisual;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1setLine;
-		Java_org_apache_harmony_text_BidiWrapper_ubidi_1setPara;
-	local : *;
-};
+HYTEXT_0.1 {
+	global :		
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1close;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1countRuns;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getDirection;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLength;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLevels;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getParaLevel;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1getRuns;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1open;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1reorderVisual;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1setLine;
+		Java_org_apache_harmony_text_BidiWrapper_ubidi_1setPara;
+	local : *;
+};

Propchange: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/linux/libhytext.exp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/hytext.def
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/hytext.def?view=diff&rev=478101&r1=478100&r2=478101
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/hytext.def (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/hytext.def Wed Nov 22 01:37:36 2006
@@ -1,18 +1,18 @@
-LIBRARY	HYTEXT
-
-SECTIONS
-	.data	READ WRITE
-	.text	EXECUTE READ
-
-EXPORTS
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1close
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1countRuns
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getDirection
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLength
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLevels
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getParaLevel
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getRuns
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1open
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1reorderVisual
-	Java_org_apache_harmony_text_BidiWrapper_ubidi_1setLine
+LIBRARY	HYTEXT
+
+SECTIONS
+	.data	READ WRITE
+	.text	EXECUTE READ
+
+EXPORTS
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1close
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1countRuns
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getDirection
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLength
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLevels
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getParaLevel
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1getRuns
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1open
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1reorderVisual
+	Java_org_apache_harmony_text_BidiWrapper_ubidi_1setLine
 	Java_org_apache_harmony_text_BidiWrapper_ubidi_1setPara

Propchange: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/windows/hytext.def
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message