Fix VM so calling functions works properly

ncw · ncw · commit e5523064fb6b · 2013-11-20T19:20:13.000Z
diff --git a/notes.txt b/notes.txt
@@ -16,6 +16,7 @@ Testing
   python3 -m dis hello.py
   python3 -mcompileall hello.py 
   mv __pycache__/hello.cpython-33.pyc hello.pyc
+  python -c 'import hello; import dis; dis.dis(hello.fn)'
 
   go build ./... && go build
   ./gpython hello.pyc
diff --git a/vm/eval.go b/vm/eval.go
@@ -862,7 +862,7 @@ func (vm *Vm) PushFrame(globals, locals py.StringDict, code *py.Code) {
 		Builtins: py.Builtins.Globals,
 	}
 	vm.frames = append(vm.frames, frame)
-	vm.frame = &frame
+	vm.frame = &vm.frames[len(vm.frames)-1]
 }
 
 // Drop the current frame
@@ -884,7 +884,6 @@ func Run(globals, locals py.StringDict, code *py.Code) (err error) {
 	vm := NewVm()
 	defer func() {
 		if r := recover(); r != nil {
-			fmt.Printf("vmstack = %#v\n", vm.stack)
 			switch x := r.(type) {
 			case error:
 				err = x
@@ -918,6 +917,7 @@ func Run(globals, locals py.StringDict, code *py.Code) (err error) {
 		}
 		vm.extended = false
 		jumpTable[opcode](vm, arg)
+		fmt.Printf("* Stack = %#v\n", vm.stack)
 	}
 	if len(vm.stack) != 1 {
 		fmt.Printf("vmstack = %#v\n", vm.stack)

Original file line number	Diff line number	Diff line change
`@@ -862,7 +862,7 @@ func (vm Vm) PushFrame(globals, locals py.StringDict, code py.Code) {`
`862`	`862`	`Builtins: py.Builtins.Globals,`
`863`	`863`	`}`
`864`	`864`	`vm.frames = append(vm.frames, frame)`
`865`		`- vm.frame = &frame`
	`865`	`+ vm.frame = &vm.frames[len(vm.frames)-1]`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`// Drop the current frame`
`@@ -884,7 +884,6 @@ func Run(globals, locals py.StringDict, code *py.Code) (err error) {`
`884`	`884`	`vm := NewVm()`
`885`	`885`	`defer func() {`
`886`	`886`	`if r := recover(); r != nil {`
`887`		`- fmt.Printf("vmstack = %#v\n", vm.stack)`
`888`	`887`	`switch x := r.(type) {`
`889`	`888`	`case error:`
`890`	`889`	`err = x`
`@@ -918,6 +917,7 @@ func Run(globals, locals py.StringDict, code *py.Code) (err error) {`
`918`	`917`	`}`
`919`	`918`	`vm.extended = false`
`920`	`919`	`jumpTable[opcode](vm, arg)`
	`920`	`+ fmt.Printf("* Stack = %#v\n", vm.stack)`
`921`	`921`	`}`
`922`	`922`	`if len(vm.stack) != 1 {`
`923`	`923`	`fmt.Printf("vmstack = %#v\n", vm.stack)`