Rename wrap/unwrap --> box/unbox
Use the correct term when moving primitive values in and out of
their parallel reference types.
Also, turn off the verifyCount check in dvmInvokeMethod unless
assertions are enabled. The verifier guarantees this.
Change-Id: I47629835784b5e770089ab3ca5410ee1c42820d9
diff --git a/vm/interp/Stack.c b/vm/interp/Stack.c
index 74e6275..058865e 100644
--- a/vm/interp/Stack.c
+++ b/vm/interp/Stack.c
@@ -722,13 +722,14 @@
verifyCount += width;
}
+#ifndef NDEBUG
if (verifyCount != method->insSize) {
LOGE("Got vfycount=%d insSize=%d for %s.%s\n", verifyCount,
method->insSize, clazz->descriptor, method->name);
assert(false);
goto bail;
}
- //dvmDumpThreadStack(dvmThreadSelf());
+#endif
if (dvmIsNativeMethod(method)) {
TRACE_METHOD_ENTER(self, method);
@@ -768,7 +769,7 @@
* in "retval" is undefined.
*/
if (returnType != NULL) {
- retObj = (Object*)dvmWrapPrimitive(retval, returnType);
+ retObj = (Object*)dvmBoxPrimitive(retval, returnType);
dvmReleaseTrackedAlloc(retObj, NULL);
}
}
diff --git a/vm/native/java_lang_reflect_Field.c b/vm/native/java_lang_reflect_Field.c
index 09a7499..9a0986e 100644
--- a/vm/native/java_lang_reflect_Field.c
+++ b/vm/native/java_lang_reflect_Field.c
@@ -480,7 +480,7 @@
getFieldValue(field, obj, &value);
/* if it's primitive, box it up */
- result = dvmWrapPrimitive(value, fieldType);
+ result = dvmBoxPrimitive(value, fieldType);
dvmReleaseTrackedAlloc((Object*) result, NULL);
RETURN_PTR(result);
}
@@ -505,8 +505,8 @@
Field* field;
JValue value;
- /* unwrap primitive, or verify object type */
- if (!dvmUnwrapPrimitive(valueObj, fieldType, &value)) {
+ /* unbox primitive, or verify object type */
+ if (!dvmUnboxPrimitive(valueObj, fieldType, &value)) {
dvmThrowException("Ljava/lang/IllegalArgumentException;",
"invalid value for field");
RETURN_VOID();
diff --git a/vm/oo/Array.c b/vm/oo/Array.c
index c7c862c..3b1c652 100644
--- a/vm/oo/Array.c
+++ b/vm/oo/Array.c
@@ -708,7 +708,7 @@
* primitive type exactly matches the box class, but it's not
* necessary for correctness.
*/
- if (!dvmUnwrapPrimitive(*src, dstElemClass, &result)) {
+ if (!dvmUnboxPrimitive(*src, dstElemClass, &result)) {
LOGW("dvmCopyObjectArray: can't store %s in %s\n",
(*src)->clazz->descriptor, dstElemClass->descriptor);
return false;
diff --git a/vm/reflect/Annotation.c b/vm/reflect/Annotation.c
index 6357014..aad73c8 100644
--- a/vm/reflect/Annotation.c
+++ b/vm/reflect/Annotation.c
@@ -401,7 +401,7 @@
case kDexAnnotationByte:
pValue->value.i = (s1) readSignedInt(ptr, valueArg);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('B'));
setObject = true;
}
@@ -409,7 +409,7 @@
case kDexAnnotationShort:
pValue->value.i = (s2) readSignedInt(ptr, valueArg);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('S'));
setObject = true;
}
@@ -417,7 +417,7 @@
case kDexAnnotationChar:
pValue->value.i = (u2) readUnsignedInt(ptr, valueArg, false);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('C'));
setObject = true;
}
@@ -425,7 +425,7 @@
case kDexAnnotationInt:
pValue->value.i = readSignedInt(ptr, valueArg);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('I'));
setObject = true;
}
@@ -433,7 +433,7 @@
case kDexAnnotationLong:
pValue->value.j = readSignedLong(ptr, valueArg);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('J'));
setObject = true;
}
@@ -441,7 +441,7 @@
case kDexAnnotationFloat:
pValue->value.i = readUnsignedInt(ptr, valueArg, true);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('F'));
setObject = true;
}
@@ -449,7 +449,7 @@
case kDexAnnotationDouble:
pValue->value.j = readUnsignedLong(ptr, valueArg, true);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('D'));
setObject = true;
}
@@ -457,7 +457,7 @@
case kDexAnnotationBoolean:
pValue->value.i = (valueArg != 0);
if (resultStyle == kAllObjects) {
- elemObj = (Object*) dvmWrapPrimitive(pValue->value,
+ elemObj = (Object*) dvmBoxPrimitive(pValue->value,
dvmFindPrimitiveClass('Z'));
setObject = true;
}
diff --git a/vm/reflect/Proxy.c b/vm/reflect/Proxy.c
index 7d0aad5..ce72d99 100644
--- a/vm/reflect/Proxy.c
+++ b/vm/reflect/Proxy.c
@@ -880,7 +880,7 @@
case 'S':
case 'I':
value.i = args[srcIndex++];
- argObjects[argCount] = (Object*) dvmWrapPrimitive(value,
+ argObjects[argCount] = (Object*) dvmBoxPrimitive(value,
dvmFindPrimitiveClass(descChar));
/* argObjects is tracked, don't need to hold this too */
dvmReleaseTrackedAlloc(argObjects[argCount], NULL);
@@ -890,7 +890,7 @@
case 'J':
value.j = dvmGetArgLong(args, srcIndex);
srcIndex += 2;
- argObjects[argCount] = (Object*) dvmWrapPrimitive(value,
+ argObjects[argCount] = (Object*) dvmBoxPrimitive(value,
dvmFindPrimitiveClass(descChar));
dvmReleaseTrackedAlloc(argObjects[argCount], NULL);
argCount++;
@@ -1044,7 +1044,7 @@
}
pResult->l = NULL;
} else {
- if (!dvmUnwrapPrimitive(invokeResult.l, returnType, pResult)) {
+ if (!dvmUnboxPrimitive(invokeResult.l, returnType, pResult)) {
dvmThrowExceptionWithClassMessage("Ljava/lang/ClassCastException;",
((Object*)invokeResult.l)->clazz->descriptor);
goto bail;
diff --git a/vm/reflect/Reflect.c b/vm/reflect/Reflect.c
index 912ff47..2a7c740 100644
--- a/vm/reflect/Reflect.c
+++ b/vm/reflect/Reflect.c
@@ -1022,7 +1022,7 @@
*
* The caller must call dvmReleaseTrackedAlloc on the result.
*/
-DataObject* dvmWrapPrimitive(JValue value, ClassObject* returnType)
+DataObject* dvmBoxPrimitive(JValue value, ClassObject* returnType)
{
static const char* boxTypes[] = { // order from enum PrimitiveType
"Ljava/lang/Boolean;",
@@ -1086,7 +1086,7 @@
*
* Returns "true" on success, "false" on failure.
*/
-bool dvmUnwrapPrimitive(Object* value, ClassObject* returnType,
+bool dvmUnboxPrimitive(Object* value, ClassObject* returnType,
JValue* pResult)
{
PrimitiveType typeIndex = returnType->primitiveType;
diff --git a/vm/reflect/Reflect.h b/vm/reflect/Reflect.h
index 16e7148..c9a9a22 100644
--- a/vm/reflect/Reflect.h
+++ b/vm/reflect/Reflect.h
@@ -77,16 +77,16 @@
int dvmConvertArgument(DataObject* arg, ClassObject* type, s4* ins);
/*
- * Create a wrapper object for a primitive data type. If "returnType" is
+ * Box a primitive value into an object. If "returnType" is
* not primitive, this just returns "value" cast to an object.
*/
-DataObject* dvmWrapPrimitive(JValue value, ClassObject* returnType);
+DataObject* dvmBoxPrimitive(JValue value, ClassObject* returnType);
/*
* Unwrap a boxed primitive. If "returnType" is not primitive, this just
* returns "value" cast into a JValue.
*/
-bool dvmUnwrapPrimitive(Object* value, ClassObject* returnType,
+bool dvmUnboxPrimitive(Object* value, ClassObject* returnType,
JValue* pResult);
/*
