[vmkit-commits] [vmkit] r57638 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Oct 16 09:40:27 2008
New Revision: 57638

URL: http://llvm.org/viewvc/llvm-project?rev=57638&view=rev
Log:
80-col violation fix.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=57638&r1=57637&r2=57638&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Thu Oct 16 09:40:27 2008
@@ -399,7 +399,8 @@
     
     StructType* structType = StructType::get(fields, false);
     virtualType = PointerType::getUnqual(structType);
-    const TargetData* targetData = mvm::MvmModule::executionEngine->getTargetData();
+    ExecutionEngine* engine = mvm::MvmModule::executionEngine;
+    const TargetData* targetData = engine->getTargetData();
     const StructLayout* sl = targetData->getStructLayout(structType);
     
     for (CommonClass::field_iterator i = classDef->virtualFields.begin(),
@@ -445,7 +446,8 @@
   
     StructType* structType = StructType::get(fields, false);
     staticType = PointerType::getUnqual(structType);
-    const TargetData* targetData = mvm::MvmModule::executionEngine->getTargetData();
+    ExecutionEngine* engine = mvm::MvmModule::executionEngine;
+    const TargetData* targetData = engine->getTargetData();
     const StructLayout* sl = targetData->getStructLayout(structType);
     
     for (CommonClass::field_iterator i = classDef->staticFields.begin(),
@@ -503,7 +505,8 @@
 
 const FunctionType* LLVMMethodInfo::getFunctionType() {
   if (!functionType) {
-    LLVMSignatureInfo* LSI = JnjvmModule::getSignatureInfo(methodDef->getSignature());
+    Signdef* sign = methodDef->getSignature();
+    LLVMSignatureInfo* LSI = JnjvmModule::getSignatureInfo(sign);
     assert(LSI);
     if (isStatic(methodDef->access)) {
       functionType = LSI->getStaticType();
@@ -665,7 +668,8 @@
   Args.push_back(ctp);
 #endif
 
-  Value* val = CallInst::Create(func, Args.begin(), Args.end(), "", currentBlock);
+  Value* val = CallInst::Create(func, Args.begin(), Args.end(), "",
+                                currentBlock);
   if (res->getFunctionType()->getReturnType() != Type::VoidTy)
     ReturnInst::Create(val, currentBlock);
   else
@@ -680,9 +684,9 @@
 
   Function* res = Function::Create(virt ? getVirtualBufType() :
                                           getStaticBufType(),
-                                      GlobalValue::ExternalLinkage,
-                                      signature->printString(),
-                                      signature->initialLoader->TheModule);
+                                   GlobalValue::ExternalLinkage,
+                                   signature->printString(),
+                                   signature->initialLoader->TheModule);
   
   BasicBlock* currentBlock = BasicBlock::Create("enter", res);
   Function::arg_iterator i = res->arg_begin();
@@ -715,7 +719,8 @@
   Args.push_back(ctp);
 #endif
 
-  Value* val = CallInst::Create(func, Args.begin(), Args.end(), "", currentBlock);
+  Value* val = CallInst::Create(func, Args.begin(), Args.end(), "",
+                                currentBlock);
   if (res->getFunctionType()->getReturnType() != Type::VoidTy)
     ReturnInst::Create(val, currentBlock);
   else
@@ -950,7 +955,8 @@
   }
 }
 
-void JnjvmModule::InitField(JavaField* field, JavaObject* obj, JavaObject* val) {
+void 
+JnjvmModule::InitField(JavaField* field, JavaObject* obj, JavaObject* val) {
   ((JavaObject**)((uint64)obj + field->ptrOffset))[0] = val;
 }