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

rename cast -> fieldAtOffset

Browse Source
This commit is contained in:
Joshua Warner
2013-02-10 17:38:51 -07:00
parent 2a1834e48a
commit 5dd770d7ea
13 changed files with 175 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/interpret.cpp
View File

@ -733,26 +733,26 @@ pushField(Thread* t, object target, object field)
switch (fieldCode(t, field)) {
case ByteField:
case BooleanField:
pushInt(t, cast<int8_t>(target, fieldOffset(t, field)));
pushInt(t, fieldAtOffset<int8_t>(target, fieldOffset(t, field)));
break;
case CharField:
case ShortField:
pushInt(t, cast<int16_t>(target, fieldOffset(t, field)));
pushInt(t, fieldAtOffset<int16_t>(target, fieldOffset(t, field)));
break;
case FloatField:
case IntField:
pushInt(t, cast<int32_t>(target, fieldOffset(t, field)));
pushInt(t, fieldAtOffset<int32_t>(target, fieldOffset(t, field)));
break;
case DoubleField:
case LongField:
pushLong(t, cast<int64_t>(target, fieldOffset(t, field)));
pushLong(t, fieldAtOffset<int64_t>(target, fieldOffset(t, field)));
break;
case ObjectField:
pushObject(t, cast<object>(target, fieldOffset(t, field)));
pushObject(t, fieldAtOffset<object>(target, fieldOffset(t, field)));
break;
default:
@ -902,7 +902,7 @@ interpret3(Thread* t, const int base)
case arraylength: {
object array = popObject(t);
if (LIKELY(array)) {
pushInt(t, cast<uintptr_t>(array, BytesPerWord));
pushInt(t, fieldAtOffset<uintptr_t>(array, BytesPerWord));
} else {
exception = makeThrowable(t, Machine::NullPointerExceptionType);
goto throw_;
@ -2436,17 +2436,17 @@ interpret3(Thread* t, const int base)
switch (fieldCode(t, field)) {
case ByteField:
case BooleanField:
cast<int8_t>(o, fieldOffset(t, field)) = value;
fieldAtOffset<int8_t>(o, fieldOffset(t, field)) = value;
break;
case CharField:
case ShortField:
cast<int16_t>(o, fieldOffset(t, field)) = value;
fieldAtOffset<int16_t>(o, fieldOffset(t, field)) = value;
break;
case FloatField:
case IntField:
cast<int32_t>(o, fieldOffset(t, field)) = value;
fieldAtOffset<int32_t>(o, fieldOffset(t, field)) = value;
break;
}
} else {
@ -2459,7 +2459,7 @@ interpret3(Thread* t, const int base)
int64_t value = popLong(t);
object o = popObject(t);
if (LIKELY(o)) {
cast<int64_t>(o, fieldOffset(t, field)) = value;
fieldAtOffset<int64_t>(o, fieldOffset(t, field)) = value;
} else {
exception = makeThrowable(t, Machine::NullPointerExceptionType);
}
@ -2510,24 +2510,24 @@ interpret3(Thread* t, const int base)
switch (fieldCode(t, field)) {
case ByteField:
case BooleanField:
cast<int8_t>(table, fieldOffset(t, field)) = value;
fieldAtOffset<int8_t>(table, fieldOffset(t, field)) = value;
break;
case CharField:
case ShortField:
cast<int16_t>(table, fieldOffset(t, field)) = value;
fieldAtOffset<int16_t>(table, fieldOffset(t, field)) = value;
break;
case FloatField:
case IntField:
cast<int32_t>(table, fieldOffset(t, field)) = value;
fieldAtOffset<int32_t>(table, fieldOffset(t, field)) = value;
break;
}
} break;
case DoubleField:
case LongField: {
cast<int64_t>(table, fieldOffset(t, field)) = popLong(t);
fieldAtOffset<int64_t>(table, fieldOffset(t, field)) = popLong(t);
} break;
case ObjectField: {
@ -2850,11 +2850,11 @@ pushArguments(Thread* t, object this_, const char* spec, object a)
case 'J':
case 'D':
pushLong(t, cast<int64_t>(objectArrayBody(t, a, index++), 8));
pushLong(t, fieldAtOffset<int64_t>(objectArrayBody(t, a, index++), 8));
break;
default:
pushInt(t, cast<int32_t>(objectArrayBody(t, a, index++),
pushInt(t, fieldAtOffset<int32_t>(objectArrayBody(t, a, index++),
BytesPerWord));
break;
}