fix array

Author: digitalgust

README.md

@@ -1,34 +1,34 @@
 
 # java2llvm
 
-An Example Project Show Convert Java Byte Code to LLVM IR assembler , compile standalone executable file
+An Example Project Show Convert Java Byte Code to LLVM IR assembler , compile standalone executable file   
 
-This project is based on [class2ir](https://github.com/MParygin/class2ir), that based on an old llvm version.
-So I've changed some instruction syntex, and repaired bug, enhanced functional.
+This project is based on [class2ir](https://github.com/MParygin/class2ir), that based on an old llvm version.   
+So I've changed some instruction syntex, and repaired bug, enhanced functional.   
 
 ### Currently:
-Generated CentOS x64 executable file, and say "Hello world".
+Generated CentOS x64 executable file, and say "Hello world".    
 
 ### Make:
-1. Enter directory java2llvm/
-2. Run build.sh, then you will get app.exe here.
+1. Enter directory java2llvm/   
+2. Run build.sh, then you will get app.exe here.   
 
-## Request:
-CentOS 7.0 x86_64
-java 1.8
-llvm-as / llc / clang  5.0
-make
+### Request:
+ CentOS 7.0 x86_64    
+ java 1.8    
+ llvm-as / llc / clang  5.0    
+ make    
 
 ### Known issue:
-1. No GC.
-2. Maybe some of java instruction can't work, need test
-3. some of java instruction not implementation , see MV.java
-4. Object memory allocation 
+* No GC.   
+* Maybe some of java instruction can't work, need test   
+* some of java instruction not implementation , see MV.java    
+* Object memory allocation    
 
 ### change log:
-1. Add base class java.lang.*, java.io.PrintStream
-2. Add String to handle text output, StringBuilder to handle string concat
-3. Trace instruction flow , to fix register var scope bug.
+* Add base class java.lang.*, java.io.PrintStream   
+* Add String to handle text output, StringBuilder to handle string concat   
+* Trace instruction flow , to fix register var scope bug.   
 
 
 

app/c/runner.c

@@ -9,11 +9,6 @@ void classes_clinit();
 
 void test_Test_main();
 
-int main() {
-    classes_clinit();
-    test_Test_main();
-}
-
 void print_debug(int v) {
     printf("lldebug: %d \n", v);
 }
@@ -22,6 +17,27 @@ void print_ptr(long long v) {
     printf("ll_ptr: %llx (%lld)\n", v, v);
 }
 
+typedef union _SlotEntry{
+    char ch;
+    short s16;
+    unsigned short u16;
+    int s32;
+    unsigned int u32;
+    long long s64;
+    unsigned long long u64;
+    float f32;
+    double f64;
+    void *_ptr;
+}SlotEntry;
+
+int main() {
+    SlotEntry slot;
+    slot.s32=40;
+    print_ptr(slot.s64);
+    classes_clinit();
+    test_Test_main();
+}
+
 /*
  inline s32 stack_size(RuntimeStack *stack) {
     return (stack->sp - stack->store);

class2ir/dist/class2ir.jar

@@ -8,12 +8,13 @@
 
 public class AssistLLVM {
 
-    static String declares = "declare noalias i8* @malloc(i32)\n" +
+    static final String declares = "declare noalias i8* @malloc(i32)\n" +
             "declare void @free(i8*)\n" +
             "declare void @print_debug(i32)\n" +
             "declare void @print_ptr(i64)\n" +
             "declare i32 @ptr_size()\n";
 
+    static final String CHAR_ARR = "[C";
 
     static Resolver resolver = new Resolver();
     static List<String> clinitMethods = new ArrayList<>();
@@ -26,13 +27,15 @@ static public void genClinits(String outpath) {
 
             //declare
             ps.println(getAssistFuncDeclare());
-            ps.println("declare void @java_lang_String__init___C(%java_lang_String*, {i32, [0 x i16]}*)");
+            String carrIRtype = Util.javaSignature2irType(resolver, CHAR_ARR);
+            ps.println("declare void @java_lang_String__init___C(%java_lang_String* %s0, " + carrIRtype + " %s1)");
             for (String s : clinitMethods) {
                 if (s != null) ps.println("declare " + s);
             }
             ps.println("\n");
 
             ps.println(Util.class2struct(resolver, "java/lang/String"));
+            ps.println(Util.class2struct(resolver, CHAR_ARR));
             ps.println("\n");
 
             //call
@@ -45,7 +48,6 @@ static public void genClinits(String outpath) {
             ps.println("\n");
 
 
-            String carrIRtype = Util.javaSignature2irType(resolver, "[C \n");
             String funcName = getConstStringFuncName();
             String extFunc = "define " + funcName + "  {\n"
                     + "    %tmps0 = alloca " + carrIRtype + "\n"
@@ -58,7 +60,7 @@ static public void genClinits(String outpath) {
                     + "    %__tmp0 = call i8* @malloc(i32 %__memsize)\n"
                     + "    %stack1 = bitcast i8* %__tmp0 to %java_lang_String*\n"
                     + "    ;              \n"
-                    + "    call void @java_lang_String__init___C(%java_lang_String* %stack1, {i32, [0 x i16]}* %stack0) \n"
+                    + "    call void @java_lang_String__init___C(%java_lang_String* %stack1, " + carrIRtype + " %stack0) \n"
                     + "    ret %java_lang_String* %stack1\n"
                     + "}                  \n";
             ps.println(extFunc);
@@ -78,7 +80,7 @@ static public void addClinit(String s) {
 
     static public String getConstStringFuncName() {
         String ty = Util.javaSignature2irType(resolver, "Ljava/lang/String;"); //for add class java.lang.String declare
-        String carrIRtype = Util.javaSignature2irType(resolver, "[C \n");
+        String carrIRtype = Util.javaSignature2irType(resolver, CHAR_ARR);
         String funcName = ty + " @construct_string_with_char_arr_(" + carrIRtype + " %s0)";
         return funcName;
     }