cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Fixed BYTE opcode

Browse Source
This commit is contained in:
obscuren 2014-07-10 12:51:19 +02:00
parent 794e65b60e
commit 67e5689f87
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ethchain/vm.go
View File

@ -22,6 +22,9 @@ var (
GasMemory = big.NewInt(1) GasMemory = big.NewInt(1)
GasData = big.NewInt(5) GasData = big.NewInt(5)
GasTx = big.NewInt(500) GasTx = big.NewInt(500)
LogTyPretty byte = 0x1
LogTyDiff byte = 0x2
) )
type Debugger interface { type Debugger interface {
@ -44,6 +47,7 @@ type Vm struct {
Verbose bool Verbose bool
logTy byte
logStr string logStr string
err error err error
@ -69,7 +73,7 @@ type RuntimeVars struct {
} }
func (self *Vm) Printf(format string, v ...interface{}) *Vm { func (self *Vm) Printf(format string, v ...interface{}) *Vm {
if self.Verbose { if self.Verbose && self.logTy == LogTyPretty {
self.logStr += fmt.Sprintf(format, v...) self.logStr += fmt.Sprintf(format, v...)
} }
@ -77,7 +81,7 @@ func (self *Vm) Printf(format string, v ...interface{}) *Vm {
} }
func (self *Vm) Endl() *Vm { func (self *Vm) Endl() *Vm {
if self.Verbose { if self.Verbose && self.logTy == LogTyPretty {
vmlogger.Debugln(self.logStr) vmlogger.Debugln(self.logStr)
self.logStr = "" self.logStr = ""
} }
@ -86,7 +90,7 @@ func (self *Vm) Endl() *Vm {
} }
func NewVm(state *State, stateManager *StateManager, vars RuntimeVars) *Vm { func NewVm(state *State, stateManager *StateManager, vars RuntimeVars) *Vm {
return &Vm{vars: vars, state: state, stateManager: stateManager} return &Vm{vars: vars, state: state, stateManager: stateManager, logTy: LogTyPretty}
} }
var Pow256 = ethutil.BigPow(2, 256) var Pow256 = ethutil.BigPow(2, 256)
@ -132,6 +136,17 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
// Get the opcode (it must be an opcode!) // Get the opcode (it must be an opcode!)
op = OpCode(val.Uint()) op = OpCode(val.Uint())
// XXX Leave this Println intact. Don't change this to the log system.
// Used for creating diffs between implementations
if vm.logTy == LogTyDiff {
b := pc.Bytes()
if len(b) == 0 {
b = []byte{0}
}
fmt.Printf("%x %x %x %x\n", closure.object.Address(), b, []byte{byte(op)}, closure.Gas.Bytes())
}
gas := new(big.Int) gas := new(big.Int)
addStepGasUsage := func(amount *big.Int) { addStepGasUsage := func(amount *big.Int) {
if amount.Cmp(ethutil.Big0) >= 0 { if amount.Cmp(ethutil.Big0) >= 0 {
@ -415,7 +430,10 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
require(2) require(2)
val, th := stack.Popn() val, th := stack.Popn()
if th.Cmp(big.NewInt(32)) < 0 { if th.Cmp(big.NewInt(32)) < 0 {
stack.Push(big.NewInt(int64(len(val.Bytes())-1) - th.Int64())) byt := big.NewInt(int64(val.Bytes()[th.Int64()]))
stack.Push(byt)
vm.Printf(" => 0x%x", byt.Bytes())
} else { } else {
stack.Push(ethutil.BigFalse) stack.Push(ethutil.BigFalse)
} }
@ -562,8 +580,9 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
case MSTORE8: case MSTORE8:
require(2) require(2)
val, mStart := stack.Popn() val, mStart := stack.Popn()
base.And(val, new(big.Int).SetInt64(0xff)) //base.And(val, new(big.Int).SetInt64(0xff))
mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(base, 256)) //mem.Set(mStart.Int64(), 32, ethutil.BigToBytes(base, 256))
mem.store[mStart.Int64()] = byte(val.Int64() & 0xff)
vm.Printf(" => 0x%x", val) vm.Printf(" => 0x%x", val)
case SLOAD: case SLOAD: