wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1026438 followup - Allow unaligned 16-bit loads in the ARM simulator, as irregexp emits them for Latin1 strings. r=nbp on IRC

Browse Source
This commit is contained in:
Jan de Mooij 2014-06-19 14:28:36 +02:00
parent efc0481224
commit dcc8818130
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/jit/arm/Simulator-arm.cpp
View File

@ -1491,8 +1491,8 @@ Simulator::setCallResult(int64_t res)
int
Simulator::readW(int32_t addr, SimInstruction *instr)
{
// The regexp engines emit unaligned loads, so we don't check for them here
// like the other methods below.
// The regexp engine emits unaligned loads, so we don't check for them here
// like most of the other methods do.
intptr_t *ptr = reinterpret_cast<intptr_t*>(addr);
return *ptr;
}
@ -1512,13 +1512,10 @@ Simulator::writeW(int32_t addr, int value, SimInstruction *instr)
uint16_t
Simulator::readHU(int32_t addr, SimInstruction *instr)
{
if ((addr & 1) == 0) {
uint16_t *ptr = reinterpret_cast<uint16_t*>(addr);
return *ptr;
}
printf("Unaligned unsigned halfword read at 0x%08x, pc=%p\n", addr, instr);
MOZ_CRASH();
return 0;
// The regexp engine emits unaligned loads, so we don't check for them here
// like most of the other methods do.
uint16_t *ptr = reinterpret_cast<uint16_t*>(addr);
return *ptr;
}
int16_t