ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-04 04:04:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix build regression on platforms with no native 64-bit CAS

Browse Source 
Unsafe.compareAndSwapLong was moved from classpath-openjdk.cpp to
builtin.cpp, but the fieldForOffset helper function was not, which
only caused problems when I tried to build for ARM.  This commit moves
said helper function, along with Unsafe.getVolatileLong, which also
uses it.
This commit is contained in:
Joel Dice 2013-12-18 11:06:15 -07:00
parent 59d5bbbb1a
commit 15906ddb12
3 changed files with 87 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classpath/sun/misc/Unsafe.java
View File

@ -48,6 +48,8 @@ public final class Unsafe {
public native void putIntVolatile(Object o, long offset, int x);
public native long getLongVolatile(Object o, long offset);
public native void putOrderedInt(Object o, long offset, int x);
public native Object getObject(Object o, long offset);

86
src/builtin.cpp
View File

@ -48,6 +48,60 @@ resolveSystemClassThrow(Thread* t, object loader, object spec)
(t, loader, spec, true, Machine::ClassNotFoundExceptionType);
}
object
fieldForOffsetInClass(Thread* t, object c, unsigned offset)
{
object super = classSuper(t, c);
if (super) {
object field = fieldForOffsetInClass(t, super, offset);
if (field) {
return field;
}
}
object table = classFieldTable(t, c);
if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i);
if ((fieldFlags(t, field) & ACC_STATIC) == 0
and fieldOffset(t, field) == offset)
{
return field;
}
}
}
return 0;
}
object
fieldForOffset(Thread* t, object o, unsigned offset)
{
object c = objectClass(t, o);
if (classVmFlags(t, c) & SingletonFlag) {
c = singletonObject(t, o, 0);
object table = classFieldTable(t, c);
if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i);
if ((fieldFlags(t, field) & ACC_STATIC)
and fieldOffset(t, field) == offset)
{
return field;
}
}
}
abort(t);
} else {
object field = fieldForOffsetInClass(t, c, offset);
if (field) {
return field;
} else {
abort(t);
}
}
}
} // namespace
extern "C" AVIAN_EXPORT void JNICALL
@ -694,7 +748,7 @@ Avian_sun_misc_Unsafe_compareAndSwapLong
return atomicCompareAndSwap64
(&fieldAtOffset<uint64_t>(target, offset), expect, update);
#else
ACQUIRE_FIELD_FOR_WRITE(t, local::fieldForOffset(t, target, offset));
ACQUIRE_FIELD_FOR_WRITE(t, fieldForOffset(t, target, offset));
if (fieldAtOffset<uint64_t>(target, offset) == expect) {
fieldAtOffset<uint64_t>(target, offset) = update;
return true;
@ -704,6 +758,36 @@ Avian_sun_misc_Unsafe_compareAndSwapLong
#endif
}
extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_sun_misc_Unsafe_getLongVolatile
(Thread* t, object, uintptr_t* arguments)
{
object o = reinterpret_cast<object>(arguments[1]);
int64_t offset; memcpy(&offset, arguments + 2, 8);
// avoid blocking the VM if this is being called in a busy loop
PROTECT(t, o);
{ ENTER(t, Thread::IdleState); }
object field;
if (BytesPerWord < 8) {
field = fieldForOffset(t, o, offset);
PROTECT(t, field);
acquire(t, field);
}
int64_t result = fieldAtOffset<int64_t>(o, offset);
if (BytesPerWord < 8) {
release(t, field);
} else {
loadMemoryBarrier();
}
return result;
}
extern "C" AVIAN_EXPORT void JNICALL
Avian_sun_misc_Unsafe_unpark
(Thread* t, object, uintptr_t* arguments)

84
src/classpath-openjdk.cpp
View File

@ -2460,60 +2460,6 @@ pipeAvailable(int fd, int* available)
#endif
}
object
fieldForOffsetInClass(Thread* t, object c, unsigned offset)
{
object super = classSuper(t, c);
if (super) {
object field = fieldForOffsetInClass(t, super, offset);
if (field) {
return field;
}
}
object table = classFieldTable(t, c);
if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i);
if ((fieldFlags(t, field) & ACC_STATIC) == 0
and fieldOffset(t, field) == offset)
{
return field;
}
}
}
return 0;
}
object
fieldForOffset(Thread* t, object o, unsigned offset)
{
object c = objectClass(t, o);
if (classVmFlags(t, c) & SingletonFlag) {
c = singletonObject(t, o, 0);
object table = classFieldTable(t, c);
if (table) {
for (unsigned i = 0; i < objectArrayLength(t, table); ++i) {
object field = objectArrayBody(t, table, i);
if ((fieldFlags(t, field) & ACC_STATIC)
and fieldOffset(t, field) == offset)
{
return field;
}
}
}
abort(t);
} else {
object field = fieldForOffsetInClass(t, c, offset);
if (field) {
return field;
} else {
abort(t);
}
}
}
} // namespace local
} // namespace
@ -2737,36 +2683,6 @@ Avian_sun_misc_Unsafe_getDouble__Ljava_lang_Object_2J
(t, method, arguments);
}
extern "C" AVIAN_EXPORT int64_t JNICALL
Avian_sun_misc_Unsafe_getLongVolatile
(Thread* t, object, uintptr_t* arguments)
{
object o = reinterpret_cast<object>(arguments[1]);
int64_t offset; memcpy(&offset, arguments + 2, 8);
// avoid blocking the VM if this is being called in a busy loop
PROTECT(t, o);
{ ENTER(t, Thread::IdleState); }
object field;
if (BytesPerWord < 8) {
field = local::fieldForOffset(t, o, offset);
PROTECT(t, field);
acquire(t, field);
}
int64_t result = fieldAtOffset<int64_t>(o, offset);
if (BytesPerWord < 8) {
release(t, field);
} else {
loadMemoryBarrier();
}
return result;
}
extern "C" AVIAN_EXPORT void JNICALL
Avian_sun_misc_Unsafe_putByte__Ljava_lang_Object_2JB
(Thread*, object, uintptr_t* arguments)