misc: code refactor

tinycedar · tinycedar · commit 169420885467 · 2017-06-27T00:31:53.000+08:00
diff --git a/instructions/const.go b/instructions/const.go
@@ -2,7 +2,7 @@ package instructions
 
 import (
 	"fmt"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type iconst_1 struct {
@@ -13,15 +13,15 @@ type iconst_2 struct {
 	opCode uint8
 }
 
-func (i *iconst_1) Execute(f *runtime.Frame) {
+func (i *iconst_1) Execute(f *thread.Frame) {
 	f.OperandStack().PushInt(1)
 }
 
 func (i *iconst_1) String() string {
 	return fmt.Sprintf("{opcode: 0x%x, iconst_1}", i.opCode)
 }
 
-func (i *iconst_2) Execute(f *runtime.Frame) {
+func (i *iconst_2) Execute(f *thread.Frame) {
 	f.OperandStack().PushInt(2)
 }
 
diff --git a/instructions/instruction.go b/instructions/instruction.go
@@ -1,7 +1,9 @@
 package instructions
 
-import "github.com/tinycedar/vanilla/runtime"
+import (
+	"github.com/tinycedar/vanilla/runtime/thread"
+)
 
 type Instruction interface {
-	Execute(frame *runtime.Frame)
+	Execute(frame *thread.Frame)
 }
diff --git a/instructions/invoke_virtual.go b/instructions/invoke_virtual.go
@@ -3,7 +3,7 @@ package instructions
 import (
 	"fmt"
 	"github.com/tinycedar/classp/classfile"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 	"strings"
 )
 
@@ -12,7 +12,7 @@ type invokevirtual struct {
 	opCode uint8
 }
 
-func (i *invokevirtual) Execute(f *runtime.Frame) {
+func (i *invokevirtual) Execute(f *thread.Frame) {
 	method := f.Method()
 	if cp, ok := method.Cp[i.offset].(*classfile.ConstantMethodrefInfo); ok {
 		invoked := cp.String(method.Cp)
diff --git a/instructions/invokestatic.go b/instructions/invokestatic.go
@@ -3,17 +3,17 @@ package instructions
 import (
 	"fmt"
 	"github.com/tinycedar/classp/classfile"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type invokestatic struct {
 	index  uint16
 	opCode uint8
 }
 
-func (i *invokestatic) Execute(f *runtime.Frame) {
+func (i *invokestatic) Execute(f *thread.Frame) {
 	s := f.Method().Cp.GetConstantInfo(i.index).(*classfile.ConstantMethodrefInfo)
-	f.Thread().Push(runtime.NewFrame(f.Thread(), f.Method().Class.FindMethod(s)))
+	f.Thread().Push(thread.NewFrame(f.Thread(), f.Method().Class.FindMethod(s)))
 	//TODO add method arg related
 }
 
diff --git a/instructions/ldc.go b/instructions/ldc.go
@@ -3,19 +3,19 @@ package instructions
 import (
 	"fmt"
 	"github.com/tinycedar/classp/classfile"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type ldc struct {
 	opCode uint8
 	index  uint8
 }
 
-func (i *ldc) Execute(f *runtime.Frame) {
+func (i *ldc) Execute(f *thread.Frame) {
 	_ldc(f, i.index)
 }
 
-func _ldc(frame *runtime.Frame, index uint8) {
+func _ldc(frame *thread.Frame, index uint8) {
 	stack := frame.OperandStack()
 	if cp, ok := frame.Method().Cp[index].(*classfile.ConstantStringInfo); ok {
 		stack.PushString(cp.String(frame.Method().Cp))
diff --git a/instructions/load.go b/instructions/load.go
@@ -2,14 +2,14 @@ package instructions
 
 import (
 	"fmt"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type iload_1 struct {
 	opCode uint8
 }
 
-func (i *iload_1) Execute(f *runtime.Frame) {
+func (i *iload_1) Execute(f *thread.Frame) {
 	_iload(f, 1)
 }
 
@@ -21,15 +21,15 @@ type iload_2 struct {
 	opCode uint8
 }
 
-func (i *iload_2) Execute(f *runtime.Frame) {
+func (i *iload_2) Execute(f *thread.Frame) {
 	_iload(f, 2)
 }
 
 func (i *iload_2) String() string {
 	return fmt.Sprintf("{opcode: 0x%x, iload_2}", i.opCode)
 }
 
-func _iload(f *runtime.Frame, index int) {
+func _iload(f *thread.Frame, index int) {
 	val := f.LocalVars().GetInt(index)
 	f.OperandStack().PushInt(val)
 }
diff --git a/instructions/math.go b/instructions/math.go
@@ -2,14 +2,14 @@ package instructions
 
 import (
 	"fmt"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type iadd struct {
 	opCode uint8
 }
 
-func (i *iadd) Execute(f *runtime.Frame) {
+func (i *iadd) Execute(f *thread.Frame) {
 	stack := f.OperandStack()
 	v2 := stack.PopInt()
 	v1 := stack.PopInt()
diff --git a/instructions/return.go b/instructions/return.go
@@ -1,11 +1,18 @@
 package instructions
 
-import "github.com/tinycedar/vanilla/runtime"
+import (
+	"fmt"
+	"github.com/tinycedar/vanilla/runtime/thread"
+)
 
 type _return struct {
 	opCode uint8
 }
 
-func (i *_return) Execute(f *runtime.Frame) {
-	f.Thread().Stack().Pop()
+func (i *_return) Execute(f *thread.Frame) {
+	f.Thread().Pop()
+}
+
+func (i *_return) String() string {
+	return fmt.Sprintf("{opcode: 0x%x, return}", i.opCode)
 }
diff --git a/instructions/store.go b/instructions/store.go
@@ -2,14 +2,14 @@ package instructions
 
 import (
 	"fmt"
-	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/thread"
 )
 
 type istore_1 struct {
 	opCode uint8
 }
 
-func (i *istore_1) Execute(f *runtime.Frame) {
+func (i *istore_1) Execute(f *thread.Frame) {
 	val := f.OperandStack().PopInt()
 	f.LocalVars().SetInt(1, val)
 }
@@ -22,7 +22,7 @@ type istore_2 struct {
 	opCode uint8
 }
 
-func (i *istore_2) Execute(f *runtime.Frame) {
+func (i *istore_2) Execute(f *thread.Frame) {
 	val := f.OperandStack().PopInt()
 	f.LocalVars().SetInt(2, val)
 }
diff --git a/interpreter.go b/interpreter.go
diff --git a/main.go b/main.go
@@ -1,5 +1,24 @@
 package main
 
+import (
+	"github.com/tinycedar/classp/classfile"
+	"github.com/tinycedar/vanilla/runtime"
+	"github.com/tinycedar/vanilla/runtime/heap"
+	"github.com/tinycedar/vanilla/runtime/thread"
+	"io/ioutil"
+	"log"
+)
+
 func main() {
-	bootstrap()
+	t := thread.NewThread()
+	t.Push(thread.NewFrame(t, getMainMethod()))
+	runtime.Interpret(t)
+}
+
+func getMainMethod() *heap.Method {
+	bytes, err := ioutil.ReadFile("test/Test.class")
+	if err != nil {
+		log.Fatal("Error reading class file")
+	}
+	return heap.FindMainMethod(classfile.Parse(bytes))
 }
diff --git a/runtime/heap/class.go b/runtime/heap/class.go
@@ -31,6 +31,15 @@ func (c *Class) FindMethod(constMethodRef *classfile.ConstantMethodrefInfo) *Met
 	return nil
 }
 
+func FindMainMethod(cf *classfile.ClassFile) *Method {
+	for _, m := range NewClass(cf).Methods() {
+		if m.Name == "main" && m.Descriptor == "([Ljava/lang/String;)V" {
+			return m
+		}
+	}
+	return nil
+}
+
 func newMethods(class *Class, members []classfile.MemberInfo) []*Method {
 	methods := make([]*Method, len(members))
 	for i, m := range members {
diff --git a/runtime/interpreter.go b/runtime/interpreter.go
@@ -0,0 +1,19 @@
+package runtime
+
+import (
+	"github.com/tinycedar/vanilla/instructions"
+	"github.com/tinycedar/vanilla/runtime/thread"
+)
+
+func Interpret(t *thread.Thread) {
+	for t.StackNotEmpty() {
+		frame := t.CurrentFrame()
+		reader := instructions.NewByteCodeReader(frame.Method().Code.Code, frame.NextPC())
+		ins := reader.FetchInstruction()
+		//fmt.Printf("pc: %d, %v, { %s }, frame: %s\n", frame.NextPC(), ins, frame.Method().Name, frame)
+		if ins != nil {
+			ins.Execute(frame)
+		}
+		frame.SetNextPC(reader.NextPC())
+	}
+}
diff --git a/runtime/thread/frame.go b/runtime/thread/frame.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 import (
 	"bytes"
diff --git a/runtime/thread/local_vars.go b/runtime/thread/local_vars.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 type LocalVars []Slot
 
diff --git a/runtime/thread/operand_stack.go b/runtime/thread/operand_stack.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 import "fmt"
 
diff --git a/runtime/thread/slot.go b/runtime/thread/slot.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 type Slot struct {
 	num int32
diff --git a/runtime/thread/stack.go b/runtime/thread/stack.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 import (
 	"bytes"
diff --git a/runtime/thread/stack_test.go b/runtime/thread/stack_test.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 import (
 	"fmt"
diff --git a/runtime/thread/thread.go b/runtime/thread/thread.go
@@ -1,4 +1,4 @@
-package runtime
+package thread
 
 type Thread struct {
 	pc    int // length of int is platform dependent
@@ -21,14 +21,6 @@ func (t *Thread) Pop() {
 	t.stack.Pop()
 }
 
-func (t *Thread) Stack() *Stack {
-	return t.stack
-}
-
-func (t *Thread) GetPC() int {
-	return t.pc
-}
-
-func (t *Thread) SetPC(pc int) {
-	t.pc = pc
+func (t *Thread) StackNotEmpty() bool {
+	return t.stack.size > 0
 }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package instructions`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/tinycedar/vanilla/runtime"`
	`5`	`+ "github.com/tinycedar/vanilla/runtime/thread"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type iconst_1 struct {`
`@@ -13,15 +13,15 @@ type iconst_2 struct {`
`13`	`13`	`opCode uint8`
`14`	`14`	`}`
`15`	`15`
`16`		`-func (i iconst_1) Execute(f runtime.Frame) {`
	`16`	`+func (i iconst_1) Execute(f thread.Frame) {`
`17`	`17`	`f.OperandStack().PushInt(1)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`func (i *iconst_1) String() string {`
`21`	`21`	`return fmt.Sprintf("{opcode: 0x%x, iconst_1}", i.opCode)`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (i iconst_2) Execute(f runtime.Frame) {`
	`24`	`+func (i iconst_2) Execute(f thread.Frame) {`
`25`	`25`	`f.OperandStack().PushInt(2)`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,17 @@ package instructions`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"github.com/tinycedar/classp/classfile"`
`6`		`- "github.com/tinycedar/vanilla/runtime"`
	`6`	`+ "github.com/tinycedar/vanilla/runtime/thread"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type invokestatic struct {`
`10`	`10`	`index uint16`
`11`	`11`	`opCode uint8`
`12`	`12`	`}`
`13`	`13`
`14`		`-func (i invokestatic) Execute(f runtime.Frame) {`
	`14`	`+func (i invokestatic) Execute(f thread.Frame) {`
`15`	`15`	`s := f.Method().Cp.GetConstantInfo(i.index).(*classfile.ConstantMethodrefInfo)`
`16`		`- f.Thread().Push(runtime.NewFrame(f.Thread(), f.Method().Class.FindMethod(s)))`
	`16`	`+ f.Thread().Push(thread.NewFrame(f.Thread(), f.Method().Class.FindMethod(s)))`
`17`	`17`	`//TODO add method arg related`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@ package instructions`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`		`- "github.com/tinycedar/vanilla/runtime"`
	`5`	`+ "github.com/tinycedar/vanilla/runtime/thread"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type iload_1 struct {`
`9`	`9`	`opCode uint8`
`10`	`10`	`}`
`11`	`11`
`12`		`-func (i iload_1) Execute(f runtime.Frame) {`
	`12`	`+func (i iload_1) Execute(f thread.Frame) {`
`13`	`13`	`_iload(f, 1)`
`14`	`14`	`}`
`15`	`15`
`@@ -21,15 +21,15 @@ type iload_2 struct {`
`21`	`21`	`opCode uint8`
`22`	`22`	`}`
`23`	`23`
`24`		`-func (i iload_2) Execute(f runtime.Frame) {`
	`24`	`+func (i iload_2) Execute(f thread.Frame) {`
`25`	`25`	`_iload(f, 2)`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (i *iload_2) String() string {`
`29`	`29`	`return fmt.Sprintf("{opcode: 0x%x, iload_2}", i.opCode)`
`30`	`30`	`}`
`31`	`31`
`32`		`-func _iload(f *runtime.Frame, index int) {`
	`32`	`+func _iload(f *thread.Frame, index int) {`
`33`	`33`	`val := f.LocalVars().GetInt(index)`
`34`	`34`	`f.OperandStack().PushInt(val)`
`35`	`35`	`}`