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

[Nicolas Geoffray]

Author: geoffray
Date: Mon Jul 13 10:28:05 2009
New Revision: 75468

URL: http://llvm.org/viewvc/llvm-project?rev=75468&view=rev
Log:
Replace '$', '<', and '>' during AOT.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaArray.h Mon Jul 13 10:28:05 2009
@@ -184,6 +184,9 @@
       } else if (buffer[i] == '[') {
         newBuffer[j++] = '_';
         newBuffer[j++] = '3';
+      } else if (buffer[i] == '$') {
+        newBuffer[j++] = '_';
+        newBuffer[j++] = '4';
       } else {
         newBuffer[j++] = buffer[i];
       }

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Mon Jul 13 10:28:05 2009
@@ -1110,10 +1110,27 @@
     else if (cur == '_') {
       ptr[0] = '_';
       ptr[1] = '1';
+      ptr += 2;
+    } else if (cur == '<') {
+      ptr[0] = '_';
+      ptr[1] = '0';
+      ptr[2] = '0';
+      ptr[3] = '0';
+      ptr[4] = '3';
+      ptr[5] = 'C';
+      ptr += 6;
+    } else if (cur == '>') {
+      ptr[0] = '_';
+      ptr[1] = '0';
+      ptr[2] = '0';
+      ptr[3] = '0';
+      ptr[4] = '3';
+      ptr[5] = 'E';
+      ptr += 6;
+    } else {
+      ptr[0] = (uint8)cur;
       ++ptr;
     }
-    else ptr[0] = (uint8)cur;
-    ++ptr;
   }
   
   sint32 i = 0;