runtime/vm/instructions_arm.cc - Issue 16695007: Fix decoding of object pool access in code patching on ARM.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/instructions_arm.cc

Issue 16695007: Fix decoding of object pool access in code patching on ARM. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/instructions_arm.cc

===================================================================

--- runtime/vm/instructions_arm.cc (revision 23918)

+++ runtime/vm/instructions_arm.cc (working copy)

@@ -93,9 +93,9 @@

offset = instr & 0xfff;

instr = Back(++end);

if ((instr & 0xffff0000) == 0xe28a0000) { // add reg, pp, shifter_op

- const int rot = (instr & 0xf00) * 2;

+ const int rot = (instr & 0xf00) >> 7;

const int imm8 = instr & 0xff;

- offset |= (imm8 >> rot) | (imm8 << (32 - rot));

+ offset += (imm8 >> rot) | (imm8 << (32 - rot));

*reg = static_cast<Register>((instr & 0xf000) >> 12);

} else {

ASSERT((instr & 0xffff0000) == 0xe08a0000); // add reg, pp, reg

« no previous file with comments | « runtime/vm/assembler_arm.h ('k') | runtime/vm/intermediate_language_arm.cc » ('j') | no next file with comments »