Code cleanup

zxh0 · zxh0 · commit a0db2e7eace7 · 2019-11-01T18:57:09.000+08:00
diff --git a/instructions/comparisons/cmp.go b/instructions/comparisons/cmp.go
@@ -17,55 +17,58 @@ type LCMP struct{ base.NoOperandsInstruction }
 func (instr *LCMP) Execute(frame *rtda.Frame) {
 	v2 := frame.PopLong()
 	v1 := frame.PopLong()
-	if v1 > v2 {
+	switch {
+	case v1 > v2:
 		frame.PushInt(1)
-	} else if v1 == v2 {
+	case v1 == v2:
 		frame.PushInt(0)
-	} else {
+	default:
 		frame.PushInt(-1)
 	}
 }
 
 // Compare float
 type FCMP struct {
 	base.NoOperandsInstruction
-	g bool // long or double
+	g bool
 }
 
 func (instr *FCMP) Execute(frame *rtda.Frame) {
 	v2 := frame.PopFloat()
 	v1 := frame.PopFloat()
-	if v1 > v2 {
+	switch {
+	case v1 > v2:
 		frame.PushInt(1)
-	} else if v1 == v2 {
+	case v1 == v2:
 		frame.PushInt(0)
-	} else if v1 < v2 {
+	case v1 < v2:
 		frame.PushInt(-1)
-	} else if instr.g {
+	case instr.g:
 		frame.PushInt(1)
-	} else {
+	default:
 		frame.PushInt(-1)
 	}
 }
 
 // Compare double
 type DCMP struct {
 	base.NoOperandsInstruction
-	g bool // long or double
+	g bool
 }
 
 func (instr *DCMP) Execute(frame *rtda.Frame) {
 	v2 := frame.PopDouble()
 	v1 := frame.PopDouble()
-	if v1 > v2 {
+	switch {
+	case v1 > v2:
 		frame.PushInt(1)
-	} else if v1 == v2 {
+	case v1 == v2:
 		frame.PushInt(0)
-	} else if v1 < v2 {
+	case v1 < v2:
 		frame.PushInt(-1)
-	} else if instr.g {
+	case instr.g:
 		frame.PushInt(1)
-	} else {
+	default:
 		frame.PushInt(-1)
 	}
 }
diff --git a/rtda/heap/class_loader.go b/rtda/heap/class_loader.go
@@ -109,10 +109,6 @@ func (loader *ClassLoader) getRefArrayClassByName(arrClassName string) *Class {
 	return loader.loadArrayClass(arrClassName)
 }
 
-func (loader *ClassLoader) ClassPath() *classpath.ClassPath {
-	return loader.classPath
-}
-
 func (loader *ClassLoader) JLObjectClass() *Class {
 	return loader.jlObjectClass
 }
diff --git a/rtda/heap/method_vtable.go b/rtda/heap/method_vtable.go
@@ -18,14 +18,14 @@ func createVtable(class *Class) {
 			if i := indexOf(class.vtable, m); i > -1 {
 				class.vtable[i] = m // override
 			} else {
-				addVmethod(class, m)
+				class.vtable = append(class.vtable, m)
 			}
 		}
 	}
 
-	_eachInterfaceMethod(class, func(m *Method) {
+	forEachInterfaceMethod(class, func(m *Method) {
 		if i := indexOf(class.vtable, m); i < 0 {
-			addVmethod(class, m)
+			class.vtable = append(class.vtable, m)
 		}
 	})
 }
@@ -57,21 +57,10 @@ func indexOf(vtable []*Method, m *Method) int {
 	return -1
 }
 
-func addVmethod(class *Class, m *Method) {
-	_len := len(class.vtable)
-	if _len == cap(class.vtable) {
-		newVtable := make([]*Method, _len, _len+8)
-		copy(newVtable, class.vtable)
-		class.vtable = newVtable
-	}
-
-	class.vtable = append(class.vtable, m)
-}
-
 // visit all interface methods
-func _eachInterfaceMethod(class *Class, f func(*Method)) {
+func forEachInterfaceMethod(class *Class, f func(*Method)) {
 	for _, iface := range class.Interfaces {
-		_eachInterfaceMethod(iface, f)
+		forEachInterfaceMethod(iface, f)
 		for _, m := range iface.Methods {
 			f(m)
 		}
diff --git a/rtda/heap/object_array.go b/rtda/heap/object_array.go
@@ -40,7 +40,7 @@ func newPrimitiveArray(arrClass *Class, count uint) *Object {
 		return newObj(arrClass, make([]int16, count), nil)
 	case "[I":
 		return newObj(arrClass, make([]int32, count), nil)
-	case "[L":
+	case "[J":
 		return newObj(arrClass, make([]int64, count), nil)
 	case "[F":
 		return newObj(arrClass, make([]float32, count), nil)

Original file line number	Diff line number	Diff line change
`@@ -109,10 +109,6 @@ func (loader ClassLoader) getRefArrayClassByName(arrClassName string) Class {`
`109`	`109`	`return loader.loadArrayClass(arrClassName)`
`110`	`110`	`}`
`111`	`111`
`112`		`-func (loader ClassLoader) ClassPath() classpath.ClassPath {`
`113`		`- return loader.classPath`
`114`		`-}`
`115`		`-`
`116`	`112`	`func (loader ClassLoader) JLObjectClass() Class {`
`117`	`113`	`return loader.jlObjectClass`
`118`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,14 @@ func createVtable(class *Class) {`
`18`	`18`	`if i := indexOf(class.vtable, m); i > -1 {`
`19`	`19`	`class.vtable[i] = m // override`
`20`	`20`	`} else {`
`21`		`- addVmethod(class, m)`
	`21`	`+ class.vtable = append(class.vtable, m)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- _eachInterfaceMethod(class, func(m *Method) {`
	`26`	`+ forEachInterfaceMethod(class, func(m *Method) {`
`27`	`27`	`if i := indexOf(class.vtable, m); i < 0 {`
`28`		`- addVmethod(class, m)`
	`28`	`+ class.vtable = append(class.vtable, m)`
`29`	`29`	`}`
`30`	`30`	`})`
`31`	`31`	`}`
`@@ -57,21 +57,10 @@ func indexOf(vtable []Method, m Method) int {`
`57`	`57`	`return -1`
`58`	`58`	`}`
`59`	`59`
`60`		`-func addVmethod(class Class, m Method) {`
`61`		`- _len := len(class.vtable)`
`62`		`- if _len == cap(class.vtable) {`
`63`		`- newVtable := make([]*Method, _len, _len+8)`
`64`		`- copy(newVtable, class.vtable)`
`65`		`- class.vtable = newVtable`
`66`		`- }`
`67`		`-`
`68`		`- class.vtable = append(class.vtable, m)`
`69`		`-}`
`70`		`-`
`71`	`60`	`// visit all interface methods`
`72`		`-func _eachInterfaceMethod(class Class, f func(Method)) {`
	`61`	`+func forEachInterfaceMethod(class Class, f func(Method)) {`
`73`	`62`	`for _, iface := range class.Interfaces {`
`74`		`- _eachInterfaceMethod(iface, f)`
	`63`	`+ forEachInterfaceMethod(iface, f)`
`75`	`64`	`for _, m := range iface.Methods {`
`76`	`65`	`f(m)`
`77`	`66`	`}`