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

Merge pull request #220 from dicej/unsafe

Browse Source 
fix some Unsafe bugs
This commit is contained in:
Joshua Warner 2014-04-07 15:23:00 -06:00
commit e86fce28ec
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/builtin.cpp
View File

@ -699,17 +699,17 @@ Avian_sun_misc_Unsafe_arrayIndexScale
{ {
object c = jclassVmClass(t, reinterpret_cast<object>(arguments[1])); object c = jclassVmClass(t, reinterpret_cast<object>(arguments[1]));
if (c == type(t, Machine::JbooleanType) if (c == type(t, Machine::BooleanArrayType)
|| c == type(t, Machine::JbyteType)) || c == type(t, Machine::ByteArrayType))
return 1; return 1;
else if (c == type(t, Machine::JshortType) else if (c == type(t, Machine::ShortArrayType)
|| c == type(t, Machine::JcharType)) || c == type(t, Machine::CharArrayType))
return 2; return 2;
else if (c == type(t, Machine::JintType) else if (c == type(t, Machine::IntArrayType)
|| c == type(t, Machine::JfloatType)) || c == type(t, Machine::FloatArrayType))
return 4; return 4;
else if (c == type(t, Machine::JlongType) else if (c == type(t, Machine::LongArrayType)
|| c == type(t, Machine::JdoubleType)) || c == type(t, Machine::DoubleArrayType))
return 8; return 8;
else else
return BytesPerWord; return BytesPerWord;
@ -832,6 +832,7 @@ Avian_sun_misc_Unsafe_compareAndSwapLong
return atomicCompareAndSwap64 return atomicCompareAndSwap64
(&fieldAtOffset<uint64_t>(target, offset), expect, update); (&fieldAtOffset<uint64_t>(target, offset), expect, update);
#else #else
PROTECT(t, target);
ACQUIRE_FIELD_FOR_WRITE(t, fieldForOffset(t, target, offset)); ACQUIRE_FIELD_FOR_WRITE(t, fieldForOffset(t, target, offset));
if (fieldAtOffset<uint64_t>(target, offset) == expect) { if (fieldAtOffset<uint64_t>(target, offset) == expect) {
fieldAtOffset<uint64_t>(target, offset) = update; fieldAtOffset<uint64_t>(target, offset) = update;
@ -849,18 +850,23 @@ Avian_sun_misc_Unsafe_getLongVolatile
object o = reinterpret_cast<object>(arguments[1]); object o = reinterpret_cast<object>(arguments[1]);
int64_t offset; memcpy(&offset, arguments + 2, 8); int64_t offset; memcpy(&offset, arguments + 2, 8);
object field; object lock;
if (BytesPerWord < 8) { if (BytesPerWord < 8) {
field = fieldForOffset(t, o, offset); if (classArrayDimensions(t, objectClass(t, o))) {
lock = objectClass(t, o);
} else {
lock = fieldForOffset(t, o, offset);
}
PROTECT(t, field); PROTECT(t, o);
acquire(t, field); PROTECT(t, lock);
acquire(t, lock);
} }
int64_t result = fieldAtOffset<int64_t>(o, offset); int64_t result = fieldAtOffset<int64_t>(o, offset);
if (BytesPerWord < 8) { if (BytesPerWord < 8) {
release(t, field); release(t, lock);
} else { } else {
loadMemoryBarrier(); loadMemoryBarrier();
} }
@ -876,12 +882,17 @@ Avian_sun_misc_Unsafe_putLongVolatile
int64_t offset; memcpy(&offset, arguments + 2, 8); int64_t offset; memcpy(&offset, arguments + 2, 8);
int64_t value; memcpy(&value, arguments + 4, 8); int64_t value; memcpy(&value, arguments + 4, 8);
object field; object lock;
if (BytesPerWord < 8) { if (BytesPerWord < 8) {
field = fieldForOffset(t, o, offset); if (classArrayDimensions(t, objectClass(t, o))) {
lock = objectClass(t, o);
} else {
lock = fieldForOffset(t, o, offset);
}
PROTECT(t, field); PROTECT(t, o);
acquire(t, field); PROTECT(t, lock);
acquire(t, lock);
} else { } else {
storeStoreMemoryBarrier(); storeStoreMemoryBarrier();
} }
@ -889,7 +900,7 @@ Avian_sun_misc_Unsafe_putLongVolatile
fieldAtOffset<int64_t>(o, offset) = value; fieldAtOffset<int64_t>(o, offset) = value;
if (BytesPerWord < 8) { if (BytesPerWord < 8) {
release(t, field); release(t, lock);
} else { } else {
storeLoadMemoryBarrier(); storeLoadMemoryBarrier();
} }