i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GSoC] [ARM] Patch by Johannes Wischert.

Browse Source 
- cleanup,
- implement atomic_set() for PXA and other pre-arm6.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32413 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2009-08-15 14:22:53 +00:00
parent 701dae79c9
commit 33a3c23a00
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/arch/arm/atomic.S
+22 -7
View File
@@ -18,7 +18,7 @@ miss1: ldrex r12, [r0]
teq r3, #0 teq r3, #0
bne miss1 bne miss1
mov r0, r12 mov r0, r12
mov pc, lr bx lr
#else #else
/* disable interrupts, do the add, and reenable */ /* disable interrupts, do the add, and reenable */
mrs r2, cpsr mrs r2, cpsr
@@ -53,7 +53,7 @@ miss2: ldrex r12, [r0]
teq r3, #0 teq r3, #0
bne miss2 bne miss2
mov r0, r12 mov r0, r12
mov pc, lr bx lr
#else #else
/* disable interrupts, do the and, and reenable */ /* disable interrupts, do the and, and reenable */
mrs r2, cpsr mrs r2, cpsr
@@ -87,7 +87,7 @@ miss3: ldrex r12, [r0]
teq r3, #0 teq r3, #0
bne miss3 bne miss3
mov r0, r12 mov r0, r12
mov pc, lr bx lr
#else #else
/* disable interrupts, do the or, and reenable */ /* disable interrupts, do the or, and reenable */
mrs r2, cpsr mrs r2, cpsr
@@ -118,7 +118,23 @@ miss4: ldrex r12, [r0]
strex r3, r1, [r0] strex r3, r1, [r0]
teq r3, #0 teq r3, #0
bne miss4 bne miss4
mov pc, lr bx lr
#else
/* disable interrupts, do the mov, and reenable */
mrs r2, cpsr
mov r12, r2
orr r2, r2, #(3<<6)
msr cpsr_c, r2
/* ints disabled, old cpsr state in r12 */
mov r3, r0
ldr r0, [r3]
str r1, [r3]
/* restore interrupts and exit */
msr cpsr_c, r12
bx lr
#endif #endif
FUNCTION_END(atomic_set) FUNCTION_END(atomic_set)
@@ -137,14 +153,13 @@ differ: clrex @ clrex
same: mov r0, r12*/ same: mov r0, r12*/
#endif #endif
#warning TODO TODO TODO #warning TODO TODO TODO
mov pc, lr bx lr
FUNCTION_END(atomic_test_and_set) FUNCTION_END(atomic_test_and_set)
/* int atomic_get(int *value) /* int atomic_get(int *value)
*/ */
#warning ARM:atomic_get ich nix verstehen !!!!!!!!!!!!
FUNCTION(atomic_get): FUNCTION(atomic_get):
mov pc, lr bx lr
FUNCTION_END(atomic_get) FUNCTION_END(atomic_get)