[vmkit-commits] [vmkit] r56236 - /vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Sep 16 00:38:45 2008
New Revision: 56236

URL: http://llvm.org/viewvc/llvm-project?rev=56236&view=rev
Log:
Fix 80-col violations.


Modified:
    vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp

Modified: vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp?rev=56236&r1=56235&r2=56236&view=diff

==============================================================================
--- vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/branches/isolate/lib/JnJVM/VMCore/JavaClass.cpp Tue Sep 16 00:38:45 2008
@@ -205,7 +205,8 @@
   buf->write(">");
 }
 
-CommonClass::CommonClass(JnjvmClassLoader* loader, const UTF8* n, bool isArray) {
+CommonClass::CommonClass(JnjvmClassLoader* loader, const UTF8* n,
+                         bool isArray) {
   name = n;
   this->lockVar = mvm::Lock::allocRecursive();
   this->condVar = mvm::Cond::allocCond();
@@ -241,7 +242,8 @@
 #endif
 }
 
-ClassArray::ClassArray(JnjvmClassLoader* loader, const UTF8* n) : CommonClass(loader, n, true) {
+ClassArray::ClassArray(JnjvmClassLoader* loader, const UTF8* n) : 
+    CommonClass(loader, n, true) {
   _funcs = 0;
   _baseClass = 0;
   super = ClassArray::SuperArray;
@@ -278,8 +280,8 @@
   if (name->elements[start] == AssessorDesc::I_TAB) {
     return arrayLoader(name, loader, start + 1, len - 1);
   } else if (name->elements[start] == AssessorDesc::I_REF) {
-    const UTF8* componentName = name->javaToInternal(loader->hashUTF8, start + 1,
-                                                     len - 2);
+    const UTF8* componentName = name->javaToInternal(loader->hashUTF8,
+                                                     start + 1, len - 2);
     UserCommonClass* cl = loader->loadName(componentName, false, true);
     return cl->classLoader;
   } else {
@@ -419,6 +421,7 @@
 }
 
 JavaObject* UserClass::doNew(Jnjvm* vm) {
+  assert(this && "No class when allocating.");
   assert(this->isReady() && "Uninitialized class when allocating.");
   JavaObject* res = (JavaObject*)vm->allocator.allocateObject(getVirtualSize(),
                                                               getVirtualVT());
@@ -459,7 +462,8 @@
     }
     
     return (Tname->elements[prof] == AssessorDesc::I_REF) &&  
-      (res && curS->inheritName(Tname->extract(classLoader->hashUTF8, prof + 1, len - 1)));
+      (res && curS->inheritName(Tname->extract(classLoader->hashUTF8, prof + 1,
+                                               len - 1)));
   } else {
     return false;
   }
@@ -687,8 +691,9 @@
     ctpInfo->resolveClassName(reader.readU2());
   
   if (!(thisClassName->equals(name))) {
-    JavaThread::get()->isolate->classFormatError("try to load %s and found class named %s",
-          printString(), thisClassName->printString());
+    JavaThread::get()->isolate->classFormatError(
+        "try to load %s and found class named %s",
+        printString(), thisClassName->printString());
   }
 
   readParents(reader);