Skip to content

Commit

Permalink
format code
Browse files Browse the repository at this point in the history
  • Loading branch information
kekeon committed Jan 10, 2019
1 parent 3a91ea7 commit 71b82f9
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 31 deletions.
32 changes: 16 additions & 16 deletions jvm.com/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,44 +20,44 @@ func main() {
}
}

func startJVM(cmd *parseCmd.Cmd){
func startJVM(cmd *parseCmd.Cmd) {
cp := classpath.Parse(cmd.XjreOption, cmd.CpOption)
className := strings.Replace(cmd.Class, ".", "/", -1)
cf := loadClass(className, cp)
fmt.Println(cmd.Class)
printClassInfo(cf)
}

func loadClass(className string, cp *classpath.Classpath) *classfile.ClassFile{
classData, _ , err := cp.ReadClass(className)
func loadClass(className string, cp *classpath.Classpath) *classfile.ClassFile {
classData, _, err := cp.ReadClass(className)

if err!= nil {
if err != nil {
panic(err)
}

cf, err := classfile.Parse(classData)

if err!= nil {
if err != nil {
panic(err)
}

return cf
}

func printClassInfo(cf *classfile.ClassFile) {
fmt.Printf("version:%v.%v\n",cf.MajorVersion(),cf.MinorVersion())
fmt.Printf("constants count:%v\n",len(cf.ConstantPoll()))
fmt.Printf("access flags:0x%x\n",cf.AccessFlags())
fmt.Printf("this class:%v\n",cf.ClassName())
fmt.Printf("super class:%v\n",cf.SuperClassName())
fmt.Printf("interfaces:%v\n",len(cf.Fields()))
for _, f := range cf.Fields(){
fmt.Printf("%s\n",f.Name())
fmt.Printf("version:%v.%v\n", cf.MajorVersion(), cf.MinorVersion())
fmt.Printf("constants count:%v\n", len(cf.ConstantPoll()))
fmt.Printf("access flags:0x%x\n", cf.AccessFlags())
fmt.Printf("this class:%v\n", cf.ClassName())
fmt.Printf("super class:%v\n", cf.SuperClassName())
fmt.Printf("interfaces:%v\n", len(cf.Fields()))
for _, f := range cf.Fields() {
fmt.Printf("%s\n", f.Name())
}

fmt.Printf("methods count: %v\n",len(cf.Methods()))
fmt.Printf("methods count: %v\n", len(cf.Methods()))

for _,m := range cf.Methods() {
fmt.Printf(" %s\n",m.Name())
for _, m := range cf.Methods() {
fmt.Printf(" %s\n", m.Name())
}
}
13 changes: 4 additions & 9 deletions jvm.com/rtda/frame.go
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
package rtda

type Frame struct {
lower *Frame
localVars LocalVars
lower *Frame
localVars LocalVars
operandStack *OperandStack
}


func NewFrame(maxLocals, maxStack uint) *Frame {
return &Frame{
localVars: newLocalVars(maxLocals),
operandStack:newOperandStack(maxStack),
localVars: newLocalVars(maxLocals),
operandStack: newOperandStack(maxStack),
}
}




1 change: 0 additions & 1 deletion jvm.com/rtda/local-vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ func newLocalVars(maxLocals uint) LocalVars {

return nil
}

6 changes: 3 additions & 3 deletions jvm.com/rtda/operand-stack.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package rtda

type OperandStack struct {
size uint
size uint
slots []Slot
}

func newOperandStack(maxStack uint) *OperandStack {
if maxStack > 0 {
return &OperandStack{
slots:make([]Slot,maxStack),
slots: make([]Slot, maxStack),
}
}
return nil
}
}
2 changes: 0 additions & 2 deletions jvm.com/rtda/slot.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ type Slot struct {
num int32
ref *Object
}


0 comments on commit 71b82f9

Please sign in to comment.