Hello world

Author: digitalgust

README.md

@@ -6,10 +6,10 @@ An Example Project Show Convert Java Byte Code to LLVM IR assembler , compile st
 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:
+### Currently:
 Generated CentOS x64 executable file, and say "Hello world".
 
-## Make:
+### Make:
 1. Enter directory java2llvm/
 2. Run build.sh, then you will get app.exe here.
 
@@ -19,13 +19,13 @@ java 1.8
 llvm-as / llc / clang  5.0
 make
 
-## Known issue:
+### 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 
 
-## change log:
+### 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.

app.exe

@@ -5,31 +5,34 @@
 #include <time.h>
 #include <unistd.h>
 
+int ptr_size() {
+    return sizeof(int *);
+}
+
 long long java_lang_System_currentTimeMillis() {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  long long v=tv.tv_sec * 1000 + tv.tv_usec / 1000;
-  return v;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    long long v = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+    return v;
 }
 
 long long java_lang_System_nanoTime() {
-  struct timeval tv;
-  gettimeofday(&tv, NULL);
-  long long v=tv.tv_sec * 1000000 + tv.tv_usec;
-  v*=1000;
-  return v;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    long long v = tv.tv_sec * 1000000 + tv.tv_usec;
+    v *= 1000;
+    return v;
 }
 
 
-void java_io_PrintStream_println_I(int value) {
-   printf("%d\n", value);
- }
+void java_io_PrintStream_println_I(void *ps, int value) {
+    printf("%d\n", value);
+}
 
- void java_io_PrintStream_println_J(long long value) {
-   printf("%lld\n", value);
- }
+void java_io_PrintStream_println_J(void *ps, long long value) {
+    printf("%lld\n", value);
+}
 
-  void java_io_PrintStream_print_C(short value) {
-    printf("%c\n", (char)value);
-    printf("%d\n", (int)value);
-  }
+void java_io_PrintStream_print_C(void *ps, unsigned short value) {
+    printf("%c", (char) value);
+}

app/c/jni_func.c

@@ -5,35 +5,41 @@
 
 #include "runner.h"
 
-void test_Test__clinit_();
+void classes_clinit();
 
 void test_Test_main();
 
 int main() {
-    test_Test__clinit_();
+    classes_clinit();
     test_Test_main();
 }
 
+void print_debug(int v) {
+    printf("lldebug: %d \n", v);
+}
+
+void print_ptr(long long v) {
+    printf("ll_ptr: %llx (%lld)\n", v, v);
+}
 
+/*
  inline s32 stack_size(RuntimeStack *stack) {
     return (stack->sp - stack->store);
 }
 
-/* push Integer */
+
  inline void push_int(RuntimeStack *stack, s32 value) {
     stack->sp->ivalue = value;//clear 64bit
     stack->sp->type = STACK_ENTRY_INT;
     stack->sp++;
 }
 
-
-/* pop Integer */
  inline s32 pop_int(RuntimeStack *stack) {
     stack->sp--;
     return stack->sp->ivalue;
 }
 
-/* push Double */
+
  inline void push_double(RuntimeStack *stack, f64 value) {
     stack->sp->dvalue = value;
     stack->sp->type = STACK_ENTRY_DOUBLE;
@@ -43,28 +49,24 @@ int main() {
     stack->sp++;
 }
 
-/* pop Double */
  inline f64 pop_double(RuntimeStack *stack) {
     stack->sp -= 2;
     return stack->sp->dvalue;
 }
 
-/* push Float */
  inline void push_float(RuntimeStack *stack, f32 value) {
     //ptr->lvalue = 0;//clear 64bit
     stack->sp->fvalue = value;
     stack->sp->type = STACK_ENTRY_FLOAT;
     stack->sp++;
 }
 
-/* pop Float */
  inline f32 pop_float(RuntimeStack *stack) {
     stack->sp--;
     return stack->sp->fvalue;
 }
 
 
-/* push Long */
  inline void push_long(RuntimeStack *stack, s64 value) {
     stack->sp->lvalue = value;
     stack->sp->type = STACK_ENTRY_LONG;
@@ -74,13 +76,11 @@ int main() {
     stack->sp++;
 }
 
-/* pop Long */
  inline s64 pop_long(RuntimeStack *stack) {
     stack->sp -= 2;
     return stack->sp->lvalue;
 }
 
-/* push Ref */
  inline void push_ref(RuntimeStack *stack, __refer value) {
     stack->sp->type = STACK_ENTRY_REF;
     stack->sp->rvalue = value;
@@ -99,7 +99,6 @@ int main() {
     stack->sp++;
 }
 
-/* Pop Stack Entry */
  inline void pop_entry(RuntimeStack *stack, StackEntry *entry) {
     stack->sp--;
     entry->lvalue = stack->sp->lvalue;
@@ -118,7 +117,6 @@ int main() {
 }
 
 
-/* Entry to Int */
  inline s32 entry_2_int(StackEntry *entry) {
     return entry->ivalue;
 }
@@ -130,3 +128,4 @@ int main() {
  inline __refer entry_2_refer(StackEntry *entry) {
     return entry->rvalue;
 }
+*/

app/c/runner.c

@@ -1,7 +1,7 @@
 #ifndef RUNNER_H
 #define RUNNER_H
 
-
+/*
 #define STACK_ENTRY_NONE        0
 #define STACK_ENTRY_INT         1
 #define STACK_ENTRY_FLOAT       2
@@ -74,5 +74,5 @@ s64 entry_2_long(StackEntry *entry);
 
 __refer entry_2_refer(StackEntry *entry);
 
-
+*/
 #endif //RUNNER_H

app/c/runner.h

@@ -1,6 +1,6 @@
 package java.lang;
 
-class StringBuilder {
+public class StringBuilder {
 
     char[] value = new char[16];
     int count = 0;
@@ -25,13 +25,19 @@ public StringBuilder append(String s) {
 
     public StringBuilder append(long i) {
         String s = "";
-        while (i != 0) {
-            int v = (int) (i % 10);
-            s = chars[v] + s;
-            i /= 10;
-        }
-        if (i < 0) {
-            s = '-' + s;
+        if(i == 0){
+            s = "0";
+        }else{
+            boolean ne = i < 0;
+            if (ne) i = -i;
+            while (i != 0) {
+                int v = (int) (i % 10);
+                s = chars[v] + s;
+                i /= 10;
+            }
+            if (ne) {
+                s = '-' + s;
+            }
         }
         return append(s);
     }

app/java/java/lang/StringBuilder.java

@@ -10,9 +10,12 @@ public class System {
     static public native long nanoTime();
 
     static public void arraycopy(char[] src, int srcPos, char[] dest, int destPos, int arr_length) {
+        if(src==null||dest==null){
+            return;
+        }
         char[] a = src;
         char[] b = dest;
-        if (a.length > srcPos + arr_length && b.length > destPos + arr_length) {
+        if (a.length >= srcPos + arr_length && b.length >= destPos + arr_length) {
             for (int i = 0; i < arr_length; i++) {
                 b[destPos + i] = a[srcPos + i];
             }

app/java/java/lang/System.java

@@ -15,15 +15,15 @@ public class Test extends TestParent {
     static Test singleton = new Test();
 
     public Test() {
-        this.bl = true;
-        this.bt = 127;
-        this.sh = 100;
-        this.in = 142;
-        this.ln = 42L;
-        this.ft = 123.33f;
-        this.db = 0.53;
-
-        System.out.println(this.in);
+//         this.bl = true;
+//         this.bt = 127;
+//         this.sh = 100;
+//         this.in = 142;
+//         this.ln = 42L;
+//         this.ft = 123.33f;
+//         this.db = 0.53;
+//
+//         System.out.println(this.in);
     }
 
     @Override
@@ -33,68 +33,47 @@ public int length() {
 
     public static void main() {
         long a = System.currentTimeMillis();
-        System.out.println(a);
+        System.out.println("begin: " + a);
         System.out.println("Hello world");
 
         Test test = new Test();
         test.in = 9;
         System.out.println(test.in);
-
-/*
-        double v[] = new double[10000];
-        int ii[] = new int[123];
-        for (int i = 0; i < 10000; i++) v[i] = i * 1.2d;
-
-        switch (test.in) {
-            case 7:
-            case 9:
-            case 10: System.out.println(10);
-                break;
-            case 11: System.out.println(7);
-                break;
-            //case 16:
-            case 18: System.out.println(5);
-                break;
-            default:
-                System.out.println(5888);
-        }
-*/
-
-
-        System.out.println(System.currentTimeMillis() - a);
-
         System.out.println(sl);
-//        System.out.println(ii[6]);
         System.out.println(singleton.ln);
 
+        long b = System.currentTimeMillis() ;
+        System.out.println("end: " + b);
+        System.out.println("cost : " + (b - a));
 
-        //double d[][] = new double[101][201];
-    }
-
-    public void t1() {
-        int a, b, c, d;
-        a = 3;
-        b = 4;
-        c = a * 2 + b * b;
-        d = 0;
 
-        if (c > 0) {
-            a = b > 3 ? 2 : 1;
-        } else {
-            if (b > 3) {
-                while (d < a) {
-                    if(d==a-1){
-                        c++;
-                    }
-                    c++;
-                    d++;
-                }
-                a = 100000;
-            } else {
-                a = 200000;
-            }
-        }
-        d = a + c;
 
     }
+
+//     public void t1() {
+//         int a, b, c, d;
+//         a = 3;
+//         b = 4;
+//         c = a * 2 + b * b;
+//         d = 0;
+//
+//         if (c > 0) {
+//             a = b > 3 ? 2 : 1;
+//         } else {
+//             if (b > 3) {
+//                 while (d < a) {
+//                     if(d==a-1){
+//                         c++;
+//                     }
+//                     c++;
+//                     d++;
+//                 }
+//                 a = 100000;
+//             } else {
+//                 a = 200000;
+//             }
+//         }
+//         d = a + c;
+//
+//     }
 }