[vmkit-commits] [vmkit] r196330 - Unify invokeInternal with J3Value* and with std::vector

[Gael Thomas]

Author: gthomas
Date: Tue Dec  3 17:24:15 2013
New Revision: 196330

URL: http://llvm.org/viewvc/llvm-project?rev=196330&view=rev
Log:
Unify invokeInternal with J3Value* and with std::vector

Modified:
    vmkit/branches/mcjit/include/j3/j3method.h
    vmkit/branches/mcjit/lib/j3/vm/j3method.cc

Modified: vmkit/branches/mcjit/include/j3/j3method.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3method.h?rev=196330&r1=196329&r2=196330&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3method.h (original)
+++ vmkit/branches/mcjit/include/j3/j3method.h Tue Dec  3 17:24:15 2013
@@ -75,7 +75,6 @@ namespace j3 {
 
 		llvm::Type* doNativeType(J3Type* type);
 
-		J3Value            internalInvoke(bool statically, std::vector<llvm::GenericValue>* args);
 		J3Value            internalInvoke(bool statically, J3ObjectHandle* handle, va_list va);
 		J3Value            internalInvoke(bool statically, J3ObjectHandle* handle, J3Value* args);
 

Modified: vmkit/branches/mcjit/lib/j3/vm/j3method.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3method.cc?rev=196330&r1=196329&r2=196330&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3method.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3method.cc Tue Dec  3 17:24:15 2013
@@ -139,23 +139,54 @@ J3Method* J3Method::newMethod(vmkit::Bum
 	return res;
 }
 
-J3Value J3Method::internalInvoke(bool statically, std::vector<llvm::GenericValue>* args) {
+
+J3Value J3Method::internalInvoke(bool statically, J3ObjectHandle* handle, J3Value* inArgs) {
+	std::vector<llvm::GenericValue> args(methodType()->nbIns());
+	J3* vm = cl()->loader()->vm();
+	J3Type* cur;
+	uint32_t i = 0;
+
+	if(handle)
+		args[i++].PointerVal = handle->obj();
+
+	for(; i<methodType()->nbIns(); i++) {  /* have to avoid collection at this point */
+		cur = methodType()->ins(i);
+		
+		if(cur == vm->typeBoolean)
+			args[i].IntVal = inArgs[i].valBoolean;
+		else if(cur == vm->typeByte)
+			args[i].IntVal = inArgs[i].valByte;
+		else if(cur == vm->typeShort)
+			args[i].IntVal = inArgs[i].valShort;
+		else if(cur == vm->typeChar)
+			args[i].IntVal = inArgs[i].valChar;
+		else if(cur == vm->typeInteger)
+			args[i].IntVal = inArgs[i].valInteger;
+		else if(cur == vm->typeLong)
+			args[i].IntVal = inArgs[i].valLong;
+		else if(cur == vm->typeFloat)
+			args[i].FloatVal = inArgs[i].valFloat;
+		else if(cur == vm->typeDouble)
+			args[i].FloatVal = inArgs[i].valDouble;
+		else
+			args[i].PointerVal = inArgs[i].valObject->obj();
+	}
+
 	J3Method* target;
 
 	if(statically)
 		target = this;
 	else {
 		/* can not use trampoline here */
-		J3ObjectHandle* self = (J3ObjectHandle*)(*args)[0].PointerVal;
+		J3ObjectHandle* self = (J3ObjectHandle*)args[0].PointerVal;
 		target = resolve(self);
 	}
 
-	fnPtr(); /* ensure that the function is compiled */
-	llvm::GenericValue res = cl()->loader()->vm()->ee()->runFunction(_llvmFunction, *args);
+	target->fnPtr(); /* ensure that the function is compiled */
+	llvm::GenericValue res = cl()->loader()->vm()->ee()->runFunction(target->_llvmFunction, args);
 
 	J3Value holder;
-	J3* vm = cl()->loader()->vm();
-	J3Type* cur = methodType()->out();
+	cur = methodType()->out();
 	
 	if(cur == vm->typeBoolean)
 		holder.valBoolean = (bool)res.IntVal.getZExtValue();
@@ -214,41 +245,6 @@ J3Value J3Method::internalInvoke(bool st
 	return internalInvoke(statically, 0, args);
 }
 
-J3Value J3Method::internalInvoke(bool statically, J3ObjectHandle* handle, J3Value* inArgs) {
-	std::vector<llvm::GenericValue> args(methodType()->nbIns());
-	J3* vm = cl()->loader()->vm();
-	J3Type* cur;
-	uint32_t i = 0;
-
-	if(handle)
-		args[i++].PointerVal = handle->obj();
-
-	for(; i<methodType()->nbIns(); i++) {  /* have to avoid collection at this point */
-		cur = methodType()->ins(i);
-		
-		if(cur == vm->typeBoolean)
-			args[i].IntVal = inArgs[i].valBoolean;
-		else if(cur == vm->typeByte)
-			args[i].IntVal = inArgs[i].valByte;
-		else if(cur == vm->typeShort)
-			args[i].IntVal = inArgs[i].valShort;
-		else if(cur == vm->typeChar)
-			args[i].IntVal = inArgs[i].valChar;
-		else if(cur == vm->typeInteger)
-			args[i].IntVal = inArgs[i].valInteger;
-		else if(cur == vm->typeLong)
-			args[i].IntVal = inArgs[i].valLong;
-		else if(cur == vm->typeFloat)
-			args[i].FloatVal = inArgs[i].valFloat;
-		else if(cur == vm->typeDouble)
-			args[i].FloatVal = inArgs[i].valDouble;
-		else
-			args[i].PointerVal = inArgs[i].valObject->obj();
-	}
-
-	return internalInvoke(statically, &args);
-}
-
 J3Value J3Method::invokeStatic(J3Value* args) {
 	return internalInvoke(1, 0, args);
 }