mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 05:10:49 +00:00
b=503205; [arm] stop hitting bogus assertion in nPatchBranch; r=crashy
This commit is contained in:
parent
91b51c4d16
commit
b53ba941af
@ -583,9 +583,10 @@ Assembler::nPatchBranch(NIns* at, NIns* target)
|
||||
// and reset at[1] for good measure
|
||||
at[1] = BKPT_insn;
|
||||
} else {
|
||||
// at[0] should already hold the correct instruction, so we just need
|
||||
// to update the target.
|
||||
NanoAssert(at[0] == (NIns)( COND_AL | (0x51<<20) | (PC<<16) | (PC<<12) | (4) ));
|
||||
// Emit a branch to a pc-relative address, which we'll store right
|
||||
// after this instruction
|
||||
at[0] = (NIns)( COND_AL | (0x51<<20) | (PC<<16) | (PC<<12) | (4) );
|
||||
// the target address
|
||||
at[1] = (NIns)(target);
|
||||
}
|
||||
VALGRIND_DISCARD_TRANSLATIONS(at, 2*sizeof(NIns));
|
||||
|
Loading…
x
Reference in New Issue
Block a user