Index: src/regexp/s390/regexp-macro-assembler-s390.cc |
diff --git a/src/regexp/s390/regexp-macro-assembler-s390.cc b/src/regexp/s390/regexp-macro-assembler-s390.cc |
index d9ca1df3124c8c660f2ac8a41524c02d6d23f228..66fe1e81813b187d3bdec5ec784de746875ab264 100644 |
--- a/src/regexp/s390/regexp-macro-assembler-s390.cc |
+++ b/src/regexp/s390/regexp-macro-assembler-s390.cc |
@@ -1232,17 +1232,39 @@ bool RegExpMacroAssemblerS390::CanReadUnaligned() { |
void RegExpMacroAssemblerS390::LoadCurrentCharacterUnchecked(int cp_offset, |
int characters) { |
- DCHECK(characters == 1); |
+ DCHECK(characters == 1 || CanReadUnaligned()); |
if (mode_ == LATIN1) { |
- __ LoadlB(current_character(), |
- MemOperand(current_input_offset(), end_of_input_address(), |
- cp_offset * char_size())); |
+ // using load reverse for endian issue |
john.yan
2016/06/16 20:55:25
These reversed loads are needed to be guard with E
|
+ if (characters == 4) { |
+ __ LoadReversedWordP(current_character(), |
+ MemOperand(current_input_offset(), end_of_input_address(), |
+ cp_offset * char_size())); |
+ } else if (characters == 2) { |
+ __ LoadReversedHalfWordP(current_character(), |
+ MemOperand(current_input_offset(), end_of_input_address(), |
+ cp_offset * char_size())); |
+ } else { |
+ DCHECK(characters == 1); |
+ __ LoadlB(current_character(), |
+ MemOperand(current_input_offset(), end_of_input_address(), |
+ cp_offset * char_size())); |
+ } |
} else { |
DCHECK(mode_ == UC16); |
- __ LoadLogicalHalfWordP( |
- current_character(), |
- MemOperand(current_input_offset(), end_of_input_address(), |
- cp_offset * char_size())); |
+ if (characters == 2) { |
+ __ LoadlW(current_character(), |
+ MemOperand(current_input_offset(), end_of_input_address(), |
+ cp_offset * char_size())); |
+ // need to swap the order of the characters for endian issue |
+ __ rll(current_character(), current_character(), Operand(16)); |
+ |
+ } else { |
+ DCHECK(characters == 1); |
+ __ LoadLogicalHalfWordP( |
+ current_character(), |
+ MemOperand(current_input_offset(), end_of_input_address(), |
+ cp_offset * char_size())); |
+ } |
} |
} |