[vmkit-commits] [vmkit] r198216 - move J3Class::size into J3Layout

[Gael Thomas]

Author: gthomas
Date: Mon Dec 30 10:38:12 2013
New Revision: 198216

URL: http://llvm.org/viewvc/llvm-project?rev=198216&view=rev
Log:
move J3Class::size into J3Layout

Modified:
    vmkit/branches/mcjit/include/j3/j3class.h
    vmkit/branches/mcjit/include/j3/j3meta.def
    vmkit/branches/mcjit/lib/j3/vm/j3class.cc
    vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
    vmkit/branches/mcjit/lib/j3/vm/j3thread.cc

Modified: vmkit/branches/mcjit/include/j3/j3class.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3class.h?rev=198216&r1=198215&r2=198216&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3class.h (original)
+++ vmkit/branches/mcjit/include/j3/j3class.h Mon Dec 30 10:38:12 2013
@@ -138,6 +138,7 @@ namespace j3 {
 		J3Type*            _type;
 		J3Attributes*      _attributes;
 		uint32_t           _num;
+		uint32_t           _offset;
 
 	public:
 		J3Field() {}
@@ -192,11 +193,15 @@ namespace j3 {
 		
 		size_t            _nbMethods;
 		J3Method**        _methods;
+
+		size_t             _size;
 	public:
 		J3Layout(J3ClassLoader* loader, const vmkit::Name* name);
 
 		virtual bool      isLayout() { return 1; }
 
+		size_t            size();
+
 		size_t            nbMethods() { return _nbMethods; }
 		J3Method**        methods() { return _methods; }
 
@@ -220,8 +225,6 @@ namespace j3 {
 
 		uint16_t           _access;
 
-		size_t             _size;
-
 		size_t             _nbInterfaces;
 		J3Class**          _interfaces;
 		J3Class*           _super;       /* this for root */
@@ -258,8 +261,6 @@ namespace j3 {
 		J3Class*            super() { return _super; }
 		uint16_t            access() { return _access; }
 
-		void                adjustSize(uint32_t n) { _size += n; }
-		size_t              size();
 		J3ObjectHandle*     staticInstance();
 
 		void                registerNative(const vmkit::Name* methName, const vmkit::Name* methSign, void* fnPtr);

Modified: vmkit/branches/mcjit/include/j3/j3meta.def
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3meta.def?rev=198216&r1=198215&r2=198216&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3meta.def (original)
+++ vmkit/branches/mcjit/include/j3/j3meta.def Mon Dec 30 10:38:12 2013
@@ -2,7 +2,7 @@ _x(funcJ3MethodIndex,            "j3::J3
 _x(funcJ3TypeVT,                 "j3::J3Type::vt()")
 _x(funcJ3TypeVTAndResolve,       "j3::J3Type::vtAndResolve()")
 _x(funcJ3TypeInitialise,         "j3::J3Type::initialise()")
-_x(funcJ3ClassSize,              "j3::J3Class::size()")
+_x(funcJ3LayoutSize,             "j3::J3Layout::size()")
 _x(funcJ3ClassStaticInstance,    "j3::J3Class::staticInstance()")
 _x(funcJ3ClassStringAt,          "j3::J3Class::stringAt(unsigned short)")
 _x(funcJ3ObjectTypeJavaClass,    "j3::J3ObjectType::javaClass()")

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=198216&r1=198215&r2=198216&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Mon Dec 30 10:38:12 2013
@@ -256,6 +256,10 @@ J3StaticLayout::J3StaticLayout(J3ClassLo
 J3Layout::J3Layout(J3ClassLoader* loader, const vmkit::Name* name) : J3ObjectType(loader, name) {
 }
 
+size_t J3Layout::size() { 
+	return _size; 
+}
+
 J3Method* J3Layout::findMethod(const vmkit::Name* name, const vmkit::Name* sign) {
 	for(size_t i=0; i<nbMethods(); i++) {
 		J3Method* cur = methods()[i];
@@ -292,10 +296,6 @@ J3Class::J3Class(J3ClassLoader* loader,
 	status = LOADED;
 }
 
-size_t J3Class::size() { 
-	return _size; 
-}
-
 llvm::GlobalValue* J3Class::llvmDescriptor(llvm::Module* module) {
 	return llvm::cast<llvm::GlobalValue>(module->getOrInsertGlobal(nativeName(), loader()->vm()->typeJ3Class));
 }

Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=198216&r1=198215&r2=198216&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Mon Dec 30 10:38:12 2013
@@ -513,7 +513,7 @@ void J3CodeGen::newObject(J3Class* cl) {
 	llvm::Value* size;
 
 	if(!cl->isResolved()) {
-		size = builder->CreateCall(funcJ3ClassSize, cl->llvmDescriptor(module()));
+		size = builder->CreateCall(funcJ3LayoutSize, cl->llvmDescriptor(module()));
 	} else {
 		size = builder->getInt64(cl->size());
 	}

Modified: vmkit/branches/mcjit/lib/j3/vm/j3thread.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3thread.cc?rev=198216&r1=198215&r2=198216&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3thread.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3thread.cc Mon Dec 30 10:38:12 2013
@@ -35,7 +35,7 @@ void J3Thread::start(J3ObjectHandle* han
 	vmkit::BumpAllocator* allocator = vmkit::BumpAllocator::create();
 	J3Thread* thread = new J3Thread(get()->vm());
 	thread->assocJavaThread(handle);
-	thread->Thread::start();
+	//thread->Thread::start();
 }
 
 J3Method* J3Thread::getJavaCaller(uint32_t level) {