[vmkit-commits] [vmkit] r199721 - Remove the vt and resolve function.

[Gael Thomas]

Author: gthomas
Date: Tue Jan 21 04:46:15 2014
New Revision: 199721

URL: http://llvm.org/viewvc/llvm-project?rev=199721&view=rev
Log:
Remove the vt and resolve function.

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

Modified: vmkit/branches/mcjit/include/j3/j3class.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3class.h?rev=199721&r1=199720&r2=199721&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3class.h (original)
+++ vmkit/branches/mcjit/include/j3/j3class.h Tue Jan 21 04:46:15 2014
@@ -80,7 +80,6 @@ namespace j3 {
 		J3Type*                     initialise();
 
 		J3VirtualTable*             vt();
-		J3VirtualTable*             vtAndResolve();
 
 		bool                        isAssignableTo(J3Type* parent);
 

Modified: vmkit/branches/mcjit/include/j3/j3object.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3object.h?rev=199721&r1=199720&r2=199721&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3object.h (original)
+++ vmkit/branches/mcjit/include/j3/j3object.h Tue Jan 21 04:46:15 2014
@@ -117,7 +117,6 @@ namespace j3 {
 		static void monitorExit(J3Object* obj);
 
 		static J3Object* allocate(J3VirtualTable* vt, uintptr_t n);
-		static J3Object* doNewNoInit(J3Class* cl);
 		static J3Object* doNew(J3Class* cl);
 	public:
 

Modified: vmkit/branches/mcjit/lib/j3/vm/j3class.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3class.cc?rev=199721&r1=199720&r2=199721&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Tue Jan 21 04:46:15 2014
@@ -41,11 +41,6 @@ J3VirtualTable* J3Type::vt() {
 	return _vt; 
 }
 
-J3VirtualTable* J3Type::vtAndResolve() { 
-	resolve();
-	return vt(); 
-}
-
 void J3Type::dump() {
 	fprintf(stderr, "Type: %s", name()->cStr());
 }

Modified: vmkit/branches/mcjit/lib/j3/vm/j3object.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3object.cc?rev=199721&r1=199720&r2=199721&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3object.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3object.cc Tue Jan 21 04:46:15 2014
@@ -282,13 +282,9 @@ J3Object* J3Object::allocate(J3VirtualTa
 	return res;
 }
 
-J3Object* J3Object::doNewNoInit(J3Class* cl) {
-	return allocate(cl->vtAndResolve(), cl->structSize());
-}
-
 J3Object* J3Object::doNew(J3Class* cl) {
 	cl->initialise();
-	return doNewNoInit(cl);
+	return allocate(cl->vt(), cl->structSize());
 }
 
 void J3Object::monitorEnter(J3Object* obj) {
@@ -379,7 +375,8 @@ bool J3Object::isLockOwner() {
  *    ---   J3ArrayObject ---
  */
 J3Object* J3ArrayObject::doNew(J3ArrayClass* cl, uintptr_t length) {
-	J3ArrayObject* res = (J3ArrayObject*)allocate(cl->vtAndResolve(), sizeof(J3ArrayObject) + (1 << cl->component()->logSize()) * length);
+	cl->resolve();
+	J3ArrayObject* res = (J3ArrayObject*)allocate(cl->vt(), sizeof(J3ArrayObject) + (1 << cl->component()->logSize()) * length);
 
 	res->_length = length;