[vmkit-commits] [vmkit] r71994 - in /vmkit/trunk/lib/JnJVM: Compiler/JavaAOTCompiler.cpp VMCore/JavaArray.h

[Nicolas Geoffray]

Author: geoffray
Date: Mon May 18 02:01:23 2009
New Revision: 71994

URL: http://llvm.org/viewvc/llvm-project?rev=71994&view=rev
Log:
Fix naming of class data in AOT files.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h

Modified: vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp?rev=71994&r1=71993&r2=71994&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JavaAOTCompiler.cpp Mon May 18 02:01:23 2009
@@ -66,7 +66,7 @@
     
       GlobalVariable* varGV = 
         new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage, 0,
-                           UTF8Buffer(classDef->name).cString(),
+                           UTF8Buffer(classDef->name).toClassName()->cString(),
                            getLLVMModule());
     
       nativeClasses.insert(std::make_pair(classDef, varGV));

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h?rev=71994&r1=71993&r2=71994&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Mon May 18 02:01:23 2009
@@ -180,6 +180,15 @@
     delete[] buffer;
   }
 
+  /// toClassName - Change '/' into '.' in the buffer.
+  ///
+  UTF8Buffer* toClassName() {
+    uint32 len = strlen(buffer);
+    for (uint32 i = 0; i < len; ++i)
+      if (buffer[i] == '/') buffer[i] = '.';
+    return this;
+  }
+
   /// cString - Return a C string representation of the buffer, suitable
   /// for printf.
   ///