Skip to content

Commit 3bc99ba

Browse files
digitalgustdigitalgust
committed
rebase to register version , very good performence
1 parent 9fb3c29 commit 3bc99ba

39 files changed

+2070
-1242
lines changed

‎README.md

+10-15
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,26 @@
44
An Example Project Show Convert Java Byte Code to LLVM IR assembler , compile standalone executable file
55

66
This project is based on [class2ir](https://github.com/MParygin/class2ir), that based on an old llvm version.
7-
So I've changed instruction syntax, refactor to stack mode to fix branch problem, and repaired some bugs.
7+
So I've changed some instruction syntex, and repaired bug, enhanced functional.
88

99
### Currently:
10-
Generated CentOS_x64 and MacOS executable file, and say "Hello world".
10+
Generated CentOS x64 executable file, and say "Hello world".
1111

1212
### Make:
1313
1. Enter directory java2llvm/
14-
2. Run ***mac_build.sh*** or ***centos_build.sh*** , then you will get a.out here.
14+
2. Run build.sh, then you will get app.exe here.
1515

16-
### Requirements:
16+
### Request:
17+
CentOS 7.0 x86_64
1718
java 1.8
18-
* Centos:
19-
CentOS 7.0 x86_64
20-
llvm-as / llc / clang 5.0
21-
make
22-
* MacOS
23-
MacOS 10.15
24-
XCode with cli tools 11.0
25-
19+
llvm-as / llc / clang 5.0
20+
make
2621

2722
### Known issue:
28-
* No GC ,can add if free time.
23+
* No GC.
2924
* Maybe some of java instruction can't work, need test
30-
* some of java instruction behavior simplify , eg. invokevirtual
31-
* Object memory allocation , like NO inheirt parent class field.
25+
* some of java instruction not implementation , see MV.java
26+
* Object memory allocation
3227

3328
### change log:
3429
* Add base class java.lang.*, java.io.PrintStream

‎app/c/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ASMS2=$(CS:%.c=%.s)
77
all: $(TARGET)
88

99
$(TARGET): $(ASMS) $(ASMS2)
10-
clang -v -lm -o3 -o $(TARGET) $(ASMS) $(ASMS2)
10+
clang -v -lm -o $(TARGET) $(ASMS) $(ASMS2)
1111
# strip $(TARGET)
1212

1313
%.ll: %.c

‎app/c/jni_func.c

-179
Original file line numberDiff line numberDiff line change
@@ -5,185 +5,10 @@
55
#include <time.h>
66
#include <unistd.h>
77

8-
#include "runner.h"
9-
108
int ptr_size() {
119
return sizeof(int *);
1210
}
1311

14-
// ====================== stack =====================
15-
union StackEntry *get_sp(struct StackFrame *stack) {
16-
return stack->sp;
17-
}
18-
19-
void set_sp(struct StackFrame *stack, union StackEntry *sp) {
20-
stack->sp = sp;
21-
}
22-
23-
void chg_sp(struct StackFrame *stack, int i) {
24-
stack->sp += i;
25-
}
26-
27-
union StackEntry *get_store(struct StackFrame *stack) {
28-
return stack->store;
29-
}
30-
31-
int get_stack_size(struct StackFrame *stack) {
32-
return stack->sp - stack->store;
33-
}
34-
35-
void push_i64(struct StackFrame *stack, long long i) {
36-
stack->sp->s64 = i;
37-
stack->sp++;
38-
stack->sp++;
39-
}
40-
41-
long long pop_i64(struct StackFrame *stack) {
42-
--stack->sp;
43-
return (--stack->sp)->s64;
44-
}
45-
46-
void push_i32(struct StackFrame *stack, int i) {
47-
stack->sp->s32 = i;
48-
stack->sp++;
49-
}
50-
51-
int pop_i32(struct StackFrame *stack) {
52-
return (--stack->sp)->s32;
53-
}
54-
55-
void push_i16(struct StackFrame *stack, short i) {
56-
stack->sp->s32 = i;
57-
stack->sp++;
58-
}
59-
60-
short pop_i16(struct StackFrame *stack) {
61-
return (short)(--stack->sp)->s32;
62-
}
63-
64-
void push_u16(struct StackFrame *stack, unsigned short i) {
65-
stack->sp->s32 = i;
66-
stack->sp++;
67-
}
68-
69-
unsigned short pop_u16(struct StackFrame *stack) {
70-
return (unsigned short)(--stack->sp)->s32;
71-
}
72-
73-
void push_i8(struct StackFrame *stack, char i) {
74-
stack->sp->s32 = i;
75-
stack->sp++;
76-
}
77-
78-
char pop_i8(struct StackFrame *stack) {
79-
return (char)(--stack->sp)->s32;
80-
}
81-
82-
void push_double(struct StackFrame *stack, double i) {
83-
stack->sp->f64 = i;
84-
stack->sp++;
85-
stack->sp++;
86-
}
87-
88-
double pop_double(struct StackFrame *stack) {
89-
--stack->sp;
90-
return (--stack->sp)->f64;
91-
}
92-
93-
void push_float(struct StackFrame *stack, float i) {
94-
stack->sp->f32 = i;
95-
stack->sp++;
96-
}
97-
98-
float pop_float(struct StackFrame *stack) {
99-
return (--stack->sp)->f32;
100-
}
101-
102-
void push_ptr(struct StackFrame *stack, void *i) {
103-
stack->sp->_ptr = i;
104-
stack->sp++;
105-
}
106-
107-
void *pop_ptr(struct StackFrame *stack) {
108-
return (--stack->sp)->_ptr;
109-
}
110-
111-
void push_entry(struct StackFrame *stack, long long i) {
112-
stack->sp->s64 = i;
113-
stack->sp++;
114-
}
115-
116-
long long pop_entry(struct StackFrame *stack) {
117-
return (--stack->sp)->s64;
118-
}
119-
120-
//====================== local var =====================
121-
122-
void localvar_set_i64(union StackEntry *base, int slot, long long i) {
123-
(base + slot)->s64 = i;
124-
}
125-
126-
long long localvar_get_i64(union StackEntry *base, int slot) {
127-
return (base + slot)->s64;
128-
}
129-
130-
void localvar_set_i32(union StackEntry *base, int slot, int i) {
131-
(base + slot)->s32 = i;
132-
}
133-
134-
int localvar_get_i32(union StackEntry *base, int slot) {
135-
return (base + slot)->s32;
136-
}
137-
138-
void localvar_set_i16(union StackEntry *base, int slot, short i) {
139-
(base + slot)->s32 = i;
140-
}
141-
142-
short localvar_get_i16(union StackEntry *base, int slot) {
143-
return (short)(base + slot)->s32;
144-
}
145-
146-
void localvar_set_u16(union StackEntry *base, int slot, unsigned short i) {
147-
(base + slot)->s32 = i;
148-
}
149-
150-
unsigned short localvar_get_u16(union StackEntry *base, int slot) {
151-
return (unsigned short)(base + slot)->s32;
152-
}
153-
154-
void localvar_set_i8(union StackEntry *base, int slot, char i) {
155-
(base + slot)->s32 = i;
156-
}
157-
158-
char localvar_get_i8(union StackEntry *base, int slot) {
159-
return (char)(base + slot)->s32;
160-
}
161-
162-
void localvar_set_double(union StackEntry *base, int slot, double i) {
163-
(base + slot)->f64 = i;
164-
}
165-
166-
double localvar_get_double(union StackEntry *base, int slot) {
167-
return (base + slot)->f64;
168-
}
169-
170-
void localvar_set_float(union StackEntry *base, int slot, float i) {
171-
(base + slot)->f32 = i;
172-
}
173-
174-
float localvar_get_float(union StackEntry *base, int slot) {
175-
return (base + slot)->f32;
176-
}
177-
178-
void localvar_set_ptr(union StackEntry *base, int slot, void *i) {
179-
(base + slot)->_ptr = i;
180-
}
181-
182-
void *localvar_get_ptr(union StackEntry *base, int slot) {
183-
return (base + slot)->_ptr;
184-
}
185-
186-
18712
long long java_lang_System_currentTimeMillis() {
18813
struct timeval tv;
18914
gettimeofday(&tv, NULL);
@@ -208,10 +33,6 @@ void java_io_PrintStream_println_J(void *ps, long long value) {
20833
printf("%lld\n", value);
20934
}
21035

211-
void java_io_PrintStream_println_D(void *ps, double value) {
212-
printf("%lf\n", value);
213-
}
214-
21536
void java_io_PrintStream_print_C(void *ps, unsigned short value) {
21637
printf("%c", (char) value);
21738
}

‎app/c/runner.c

+3-12
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
#include "runner.h"
77

8-
int max_stack_size = 20480;
9-
struct StackFrame *pthd_stack; //can be extends to multithread
10-
118
void classes_clinit();
129

1310
void test_Test_main();
@@ -16,18 +13,12 @@ void print_debug(int v) {
1613
printf("lldebug: %d \n", v);
1714
}
1815

19-
void print_ptr(char *v) {
20-
printf("ll_ptr: %llx (%lld)\n", (long long)(intptr_t)v, (long long)(intptr_t)v);
16+
void print_ptr(long long v) {
17+
printf("ll_ptr: %llx (%lld)\n", v, v);
2118
}
2219

23-
int main() {
24-
pthd_stack = malloc(sizeof(struct StackFrame));
25-
pthd_stack->store = malloc(sizeof(union StackEntry) * max_stack_size);
26-
pthd_stack->sp = pthd_stack->store;
2720

21+
int main() {
2822
classes_clinit();
2923
test_Test_main();
30-
31-
free(pthd_stack);
3224
}
33-

‎app/c/runner.h

-108
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,4 @@
11
#ifndef RUNNER_H
22
#define RUNNER_H
33

4-
/*
5-
#define STACK_ENTRY_NONE 0
6-
#define STACK_ENTRY_INT 1
7-
#define STACK_ENTRY_FLOAT 2
8-
#define STACK_ENTRY_LONG 4
9-
#define STACK_ENTRY_DOUBLE 8
10-
#define STACK_ENTRY_REF 16
11-
12-
*/
13-
14-
union StackEntry {
15-
int s32;
16-
long long s64;
17-
float f32;
18-
double f64;
19-
void *_ptr;
20-
};
21-
22-
struct StackFrame {
23-
union StackEntry *store;
24-
union StackEntry *sp;
25-
int max_size;
26-
};
27-
28-
extern int max_stack_size;
29-
extern struct StackFrame *pthd_stack;
30-
31-
32-
union StackEntry *get_sp(struct StackFrame *stack);
33-
34-
void set_sp(struct StackFrame *stack, union StackEntry *sp);
35-
36-
void chg_sp(struct StackFrame *stack, int i);
37-
38-
union StackEntry *get_store(struct StackFrame *stack);
39-
40-
int get_stack_size(struct StackFrame *stack);
41-
42-
void push_i64(struct StackFrame *stack, long long i);
43-
44-
long long pop_i64(struct StackFrame *stack);
45-
46-
void push_i32(struct StackFrame *stack, int i);
47-
48-
int pop_i32(struct StackFrame *stack);
49-
50-
void push_i16(struct StackFrame *stack, short i);
51-
52-
short pop_i16(struct StackFrame *stack);
53-
54-
void push_u16(struct StackFrame *stack, unsigned short i);
55-
56-
unsigned short pop_u16(struct StackFrame *stack);
57-
58-
void push_i8(struct StackFrame *stack, char i);
59-
60-
char pop_i8(struct StackFrame *stack);
61-
62-
void push_double(struct StackFrame *stack, double i);
63-
64-
double pop_double(struct StackFrame *stack);
65-
66-
void push_float(struct StackFrame *stack, float i);
67-
68-
float pop_float(struct StackFrame *stack);
69-
70-
void push_ptr(struct StackFrame *stack, void *i);
71-
72-
void *pop_ptr(struct StackFrame *stack);
73-
74-
void push_entry(struct StackFrame *stack, long long i);
75-
76-
long long pop_entry(struct StackFrame *stack);
77-
78-
//====================== local var =====================
79-
80-
void localvar_set_i64(union StackEntry *base, int slot, long long i);
81-
82-
long long localvar_get_i64(union StackEntry *base, int slot);
83-
84-
void localvar_set_i32(union StackEntry *base, int slot, int i);
85-
86-
int localvar_get_i32(union StackEntry *base, int slot);
87-
88-
void localvar_set_i16(union StackEntry *base, int slot, short i);
89-
90-
short localvar_get_i16(union StackEntry *base, int slot);
91-
92-
void localvar_set_u16(union StackEntry *base, int slot, unsigned short i);
93-
94-
unsigned short localvar_get_u16(union StackEntry *base, int slot);
95-
96-
void localvar_set_i8(union StackEntry *base, int slot, char i);
97-
98-
char localvar_get_i8(union StackEntry *base, int slot);
99-
100-
void localvar_set_double(union StackEntry *base, int slot, double i);
101-
102-
double localvar_get_double(union StackEntry *base, int slot);
103-
104-
void localvar_set_float(union StackEntry *base, int slot, float i);
105-
106-
float localvar_get_float(union StackEntry *base, int slot);
107-
108-
void localvar_set_ptr(union StackEntry *base, int slot, void *i);
109-
110-
void *localvar_get_ptr(union StackEntry *base, int slot);
111-
1124
#endif //RUNNER_H

0 commit comments

Comments
 (0)