projects
/
cacao.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
334739c
)
* src/vm/jit/s390/md-atomic.hpp: Repaired.
author
Stefan Ring
<stefan@complang.tuwien.ac.at>
Sat, 7 Aug 2010 19:58:54 +0000
(21:58 +0200)
committer
Stefan Ring
<stefan@complang.tuwien.ac.at>
Sat, 7 Aug 2010 19:58:54 +0000
(21:58 +0200)
src/vm/jit/s390/md-atomic.hpp
patch
|
blob
|
history
diff --git
a/src/vm/jit/s390/md-atomic.hpp
b/src/vm/jit/s390/md-atomic.hpp
index 7780ede7cdfe35d68c046f9cf30c1bac254d2f5e..8d5ae29fd4a07be7c598be8b449739c96d5a5d70 100644
(file)
--- a/
src/vm/jit/s390/md-atomic.hpp
+++ b/
src/vm/jit/s390/md-atomic.hpp
@@
-1,6
+1,6
@@
/* src/vm/jit/s390/md-atomic.hpp - s390 atomic instructions
/* src/vm/jit/s390/md-atomic.hpp - s390 atomic instructions
- Copyright (C) 2008
+ Copyright (C) 2008
, 2010
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
@@
-43,7
+43,7
@@
namespace Atomic_md {
*
* @return value of the memory location before the store
*/
*
* @return value of the memory location before the store
*/
-inline uint32_t ompare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval)
+inline uint32_t
c
ompare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t newval)
{
__asm__ __volatile__ (
"cs %0,%3,0(%2)\n"
{
__asm__ __volatile__ (
"cs %0,%3,0(%2)\n"
@@
-64,7
+64,7
@@
inline uint32_t ompare_and_swap(volatile uint32_t *p, uint32_t oldval, uint32_t
*
* @return value of the memory location before the store
*/
*
* @return value of the memory location before the store
*/
-inline uint64_t ompare_and_swap(volatile uint64_t *p, uint64_t oldval, uint64_t newval)
+inline uint64_t
c
ompare_and_swap(volatile uint64_t *p, uint64_t oldval, uint64_t newval)
{
return Atomic::generic_compare_and_swap(p, oldval, newval);
}
{
return Atomic::generic_compare_and_swap(p, oldval, newval);
}
@@
-73,7
+73,7
@@
inline uint64_t ompare_and_swap(volatile uint64_t *p, uint64_t oldval, uint64_t
/**
* A memory barrier.
*/
/**
* A memory barrier.
*/
-inline void emory_barrier(void)
+inline void
m
emory_barrier(void)
{
__asm__ __volatile__ ("bcr 15,0" : : : "memory" );
}
{
__asm__ __volatile__ ("bcr 15,0" : : : "memory" );
}
@@
-82,7
+82,7
@@
inline void emory_barrier(void)
/**
* A write memory barrier.
*/
/**
* A write memory barrier.
*/
-inline void rite_memory_barrier(void)
+inline void
w
rite_memory_barrier(void)
{
memory_barrier();
}
{
memory_barrier();
}
@@
-90,9
+90,9
@@
inline void rite_memory_barrier(void)
/**
* An instruction barrier.
*/
/**
* An instruction barrier.
*/
-inline void nstruction_barrier(void)
+inline void
i
nstruction_barrier(void)
{
{
-
memory_barrier(
);
+
__asm__ __volatile__ ("" : : : "memory"
);
}
}
}
}