Index: src/s390/macro-assembler-s390.cc |
diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc |
index 3b3f7dc430f7c8a3ab06cf4e231704452fcef20b..ed1daf1feabdc6ee406e3c100fcc8aed3cb98984 100644 |
--- a/src/s390/macro-assembler-s390.cc |
+++ b/src/s390/macro-assembler-s390.cc |
@@ -1847,95 +1847,6 @@ void MacroAssembler::FastAllocate(int object_size, Register result, |
AddP(result, result, Operand(kHeapObjectTag)); |
} |
-void MacroAssembler::AllocateTwoByteString(Register result, Register length, |
- Register scratch1, Register scratch2, |
- Register scratch3, |
- Label* gc_required) { |
- // Calculate the number of bytes needed for the characters in the string while |
- // observing object alignment. |
- DCHECK((SeqTwoByteString::kHeaderSize & kObjectAlignmentMask) == 0); |
- |
- ShiftLeftP(scratch1, length, Operand(1)); // Length in bytes, not chars. |
- AddP(scratch1, Operand(kObjectAlignmentMask + SeqTwoByteString::kHeaderSize)); |
- |
- AndP(scratch1, Operand(~kObjectAlignmentMask)); |
- |
- // Allocate two-byte string in new space. |
- Allocate(scratch1, result, scratch2, scratch3, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- // Set the map, length and hash field. |
- InitializeNewString(result, length, Heap::kStringMapRootIndex, scratch1, |
- scratch2); |
-} |
- |
-void MacroAssembler::AllocateOneByteString(Register result, Register length, |
- Register scratch1, Register scratch2, |
- Register scratch3, |
- Label* gc_required) { |
- // Calculate the number of bytes needed for the characters in the string while |
- // observing object alignment. |
- DCHECK((SeqOneByteString::kHeaderSize & kObjectAlignmentMask) == 0); |
- DCHECK(kCharSize == 1); |
- AddP(scratch1, length, |
- Operand(kObjectAlignmentMask + SeqOneByteString::kHeaderSize)); |
- AndP(scratch1, Operand(~kObjectAlignmentMask)); |
- |
- // Allocate one-byte string in new space. |
- Allocate(scratch1, result, scratch2, scratch3, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- // Set the map, length and hash field. |
- InitializeNewString(result, length, Heap::kOneByteStringMapRootIndex, |
- scratch1, scratch2); |
-} |
- |
-void MacroAssembler::AllocateTwoByteConsString(Register result, Register length, |
- Register scratch1, |
- Register scratch2, |
- Label* gc_required) { |
- Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- InitializeNewString(result, length, Heap::kConsStringMapRootIndex, scratch1, |
- scratch2); |
-} |
- |
-void MacroAssembler::AllocateOneByteConsString(Register result, Register length, |
- Register scratch1, |
- Register scratch2, |
- Label* gc_required) { |
- Allocate(ConsString::kSize, result, scratch1, scratch2, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- InitializeNewString(result, length, Heap::kConsOneByteStringMapRootIndex, |
- scratch1, scratch2); |
-} |
- |
-void MacroAssembler::AllocateTwoByteSlicedString(Register result, |
- Register length, |
- Register scratch1, |
- Register scratch2, |
- Label* gc_required) { |
- Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- InitializeNewString(result, length, Heap::kSlicedStringMapRootIndex, scratch1, |
- scratch2); |
-} |
- |
-void MacroAssembler::AllocateOneByteSlicedString(Register result, |
- Register length, |
- Register scratch1, |
- Register scratch2, |
- Label* gc_required) { |
- Allocate(SlicedString::kSize, result, scratch1, scratch2, gc_required, |
- NO_ALLOCATION_FLAGS); |
- |
- InitializeNewString(result, length, Heap::kSlicedOneByteStringMapRootIndex, |
- scratch1, scratch2); |
-} |
- |
void MacroAssembler::CompareObjectType(Register object, Register map, |
Register type_reg, InstanceType type) { |
const Register temp = type_reg.is(no_reg) ? r0 : type_reg; |
@@ -2793,20 +2704,6 @@ void MacroAssembler::JumpIfBothInstanceTypesAreNotSequentialOneByte( |
bne(failure); |
} |
-void MacroAssembler::JumpIfInstanceTypeIsNotSequentialOneByte(Register type, |
- Register scratch, |
- Label* failure) { |
- const int kFlatOneByteStringMask = |
- kIsNotStringMask | kStringEncodingMask | kStringRepresentationMask; |
- const int kFlatOneByteStringTag = |
- kStringTag | kOneByteStringTag | kSeqStringTag; |
- |
- if (!scratch.is(type)) LoadRR(scratch, type); |
- nilf(scratch, Operand(kFlatOneByteStringMask)); |
- CmpP(scratch, Operand(kFlatOneByteStringTag)); |
- bne(failure); |
-} |
- |
static const int kRegisterPassedArguments = 5; |
int MacroAssembler::CalculateStackPassedWords(int num_reg_arguments, |