Revert "merge branch jni"

This reverts commit 65865cc.
zxh0 · Oct 14, 2019 · a8635ce · a8635ce
1 parent 65865cc
commit a8635ce
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 1,488 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,4 @@ bin
 build
 out
 myjre
-*.dylib
+/java
diff --git a/Makefile b/Makefile
diff --git a/interpreter/interpreter.go b/interpreter/interpreter.go
@@ -10,37 +10,7 @@ import (
 	"github.com/zxh0/jvm.go/vmerrors"
 )
 
-func ExecMethod(thread *rtda.Thread, method *heap.Method, args []heap.Slot) heap.Slot {
-	shimFrame := rtda.NewShimFrame(thread, args)
-	thread.PushFrame(shimFrame)
-	thread.InvokeMethod(method)
-
-	verbose := thread.VMOptions.VerboseInstr
-	defer _catchErr(thread) // todo
-
-	for {
-		frame := thread.CurrentFrame()
-		if frame == shimFrame {
-			thread.PopFrame()
-			if frame.IsStackEmpty() {
-				return heap.EmptySlot
-			} else {
-				return frame.Pop()
-			}
-		}
-
-		thread.PC = frame.NextPC
-		frame.NextPC++
-
-		// fetch & execute instruction
-		instr := getInstruction(frame.Method, thread.PC)
-		instr.Execute(frame)
-		if verbose {
-			_logInstruction(frame, instr)
-		}
-	}
-}
-
+// todo
 func Loop(thread *rtda.Thread) {
 	threadObj := thread.JThread()
 	isDaemon := threadObj != nil && threadObj.GetFieldValue("daemon", "Z").IntValue() == 1

diff --git a/jni/alias.go b/jni/alias.go
diff --git a/jni/env.go b/jni/env.go
diff --git a/jni/java_util_TimeZone.go b/jni/java_util_TimeZone.go
diff --git a/jni/utils.go b/jni/utils.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,4 @@ bin @@
     build
     out
     myjre
-    *.dylib
+    /java