[vmkit-commits] [vmkit] r61804 - in /vmkit/trunk/lib/JnJVM/VMCore: JavaArray.cpp JavaArray.h JavaClass.cpp JavaTypes.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jan  6 04:25:54 2009
New Revision: 61804

URL: http://llvm.org/viewvc/llvm-project?rev=61804&view=rev
Log:
One day, internal UTF8s will just be char*.... until then, do not
use virtual functions of UTF8s (especially print).


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.cpp Tue Jan  6 04:25:54 2009
@@ -35,11 +35,15 @@
 const unsigned int JavaArray::T_INT = 10;
 const unsigned int JavaArray::T_LONG = 11;
 
-void UTF8::print(mvm::PrintBuffer* buf) const {
+void UTF8::printUTF8(mvm::PrintBuffer* buf) const {
   for (int i = 0; i < size; i++)
     buf->writeChar((char)elements[i]);
 }
 
+void UTF8::print(mvm::PrintBuffer* buf) const {
+  return printUTF8(buf);
+}
+
 const UTF8* UTF8::javaToInternal(Jnjvm* vm, unsigned int start,
                                  unsigned int len) const {
   UTF8* array = (UTF8*)vm->upcalls->ArrayOfChar->doNew(len, vm);

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Tue Jan  6 04:25:54 2009
@@ -174,6 +174,9 @@
   
   /// print - Prints the UTF8 for debugging purposes.
   virtual void print(mvm::PrintBuffer* buf) const;
+  
+  /// printUTF8 - Prints the UTF8 for debugging purposes.
+  void printUTF8(mvm::PrintBuffer* buf) const;
 
 };
 

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Tue Jan  6 04:25:54 2009
@@ -182,7 +182,7 @@
     if (name->elements[stepsEnd] == I_REF) {
       printClassNameIntern(name, (stepsEnd + 1),(end - 1), buf);
     } else {
-      name->print(buf);
+      name->printUTF8(buf);
     }
     buf->write(" ");
     for (uint32 i = start; i < stepsEnd; i++)
@@ -392,6 +392,7 @@
 const char* JavaMethod::printString() const {
   mvm::PrintBuffer *buf= mvm::PrintBuffer::alloc();
   buf->write("JavaMethod<");
+  fprintf(stderr, "name = %s\n", name->printString());
   ((JavaMethod*)this)->getSignature()->printWithSign(classDef, name, buf);
   buf->write(">");
   return buf->contents()->cString();
@@ -408,7 +409,7 @@
   buf->write(" ");
   classDef->print(buf);
   buf->write("::");
-  name->print(buf);
+  name->printUTF8(buf);
   buf->write(">");
   return buf->contents()->cString();
 }

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaTypes.cpp Tue Jan  6 04:25:54 2009
@@ -17,7 +17,7 @@
 using namespace jnjvm;
 
 void PrimitiveTypedef::tPrintBuf(mvm::PrintBuffer* buf) const {
-  prim->name->print(buf);
+  prim->name->printUTF8(buf);
 }
 
 void ArrayTypedef::tPrintBuf(mvm::PrintBuffer* buf) const {
@@ -73,7 +73,7 @@
   buf->write(" ");
   CommonClass::printClassName(cl->name, buf);
   buf->write("::");
-  name->print(buf);
+  name->printUTF8(buf);
   humanPrintArgs(buf);
 }