Skip to content

Commit

Permalink
core/vm: Rename + updated doc on jumpdest analysis
Browse files Browse the repository at this point in the history
  • Loading branch information
holiman committed Sep 8, 2017
1 parent 54b1de6 commit d6681ed
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions core/vm/analysis.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (d destinations) has(codehash common.Hash, code []byte, dest *big.Int) bool

m, analysed := d[codehash]
if !analysed {
m = jumpdests(code)
m = codeBitmap(code)
d[codehash] = m
}
return OpCode(code[udest]) == JUMPDEST && m.codeSegment(udest)
Expand All @@ -61,9 +61,9 @@ func (bits *bitvec) codeSegment(pos uint64) bool {
return ((*bits)[pos/8] & (0x80 >> (pos % 8))) == 0
}

// jumpdests creates a map that contains an entry for each
// PC location that is a JUMPDEST instruction.
func jumpdests(code []byte) []byte {
// jumpdests creates a bitmap of the code, where 1 represents a DATA-segment,
// and 0 represents code-segment
func codeBitmap(code []byte) []byte {
//The map is 4 bytes longer than necessary, in case the code
// ends with a PUSH32, the algorithm will push zeroes onto the
// bitvector outside the bounds of the actual code.
Expand Down
2 changes: 1 addition & 1 deletion core/vm/analysis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestJumpDestAnalysis(t *testing.T) {
{[]byte{byte(PUSH32)}, 0xFF, 2},
}
for _, test := range tests {
ret := jumpdests(test.code)
ret := codeBitmap(test.code)
if ret[test.which] != test.exp {
t.Fatalf("expected %x, got %02x", test.exp, ret[test.which])
}
Expand Down

0 comments on commit d6681ed

Please sign in to comment.