Commit 64e3bad3 authored by bmeurer's avatar bmeurer Committed by Commit bot

Remove obsolete functionality from the MacroAssemblers.

This is uncontroversial the dead code removal part of
https://codereview.chromium.org/1307943013, which was
previously landed, but got reverted because of DOM
breakage that requires more investigation.

TBR=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/1322843005

Cr-Commit-Position: refs/heads/master@{#30577}
parent 6990fb1c
...@@ -1390,26 +1390,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function, ...@@ -1390,26 +1390,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function,
} }
void MacroAssembler::IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail) {
ldr(map, FieldMemOperand(heap_object, HeapObject::kMapOffset));
IsInstanceJSObjectType(map, scratch, fail);
}
void MacroAssembler::IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail) {
ldrb(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset));
cmp(scratch, Operand(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE));
b(lt, fail);
cmp(scratch, Operand(LAST_NONCALLABLE_SPEC_OBJECT_TYPE));
b(gt, fail);
}
void MacroAssembler::IsObjectJSStringType(Register object, void MacroAssembler::IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail) { Label* fail) {
......
...@@ -662,15 +662,6 @@ class MacroAssembler: public Assembler { ...@@ -662,15 +662,6 @@ class MacroAssembler: public Assembler {
InvokeFlag flag, InvokeFlag flag,
const CallWrapper& call_wrapper); const CallWrapper& call_wrapper);
void IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail);
void IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail);
void IsObjectJSStringType(Register object, void IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail); Label* fail);
......
...@@ -752,26 +752,6 @@ Condition MacroAssembler::IsObjectNameType(Register heap_object, ...@@ -752,26 +752,6 @@ Condition MacroAssembler::IsObjectNameType(Register heap_object,
} }
void MacroAssembler::IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail) {
mov(map, FieldOperand(heap_object, HeapObject::kMapOffset));
IsInstanceJSObjectType(map, scratch, fail);
}
void MacroAssembler::IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail) {
movzx_b(scratch, FieldOperand(map, Map::kInstanceTypeOffset));
sub(scratch, Immediate(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE));
cmp(scratch,
LAST_NONCALLABLE_SPEC_OBJECT_TYPE - FIRST_NONCALLABLE_SPEC_OBJECT_TYPE);
j(above, fail);
}
void MacroAssembler::FCmp() { void MacroAssembler::FCmp() {
fucomip(); fucomip();
fstp(0); fstp(0);
...@@ -1784,9 +1764,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map, ...@@ -1784,9 +1764,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map,
Label done, loop; Label done, loop;
mov(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset)); mov(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset));
bind(&loop); bind(&loop);
JumpIfSmi(result, &done); JumpIfSmi(result, &done, Label::kNear);
CmpObjectType(result, MAP_TYPE, temp); CmpObjectType(result, MAP_TYPE, temp);
j(not_equal, &done); j(not_equal, &done, Label::kNear);
mov(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset)); mov(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset));
jmp(&loop); jmp(&loop);
bind(&done); bind(&done);
......
...@@ -452,18 +452,6 @@ class MacroAssembler: public Assembler { ...@@ -452,18 +452,6 @@ class MacroAssembler: public Assembler {
Register map, Register map,
Register instance_type); Register instance_type);
// Check if a heap object's type is in the JSObject range, not including
// JSFunction. The object's map will be loaded in the map register.
// Any or all of the three registers may be the same.
// The contents of the scratch register will always be overwritten.
void IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail);
// The contents of the scratch register will be overwritten.
void IsInstanceJSObjectType(Register map, Register scratch, Label* fail);
// FCmp is similar to integer cmp, but requires unsigned // FCmp is similar to integer cmp, but requires unsigned
// jcc instructions (je, ja, jae, jb, jbe, je, and jz). // jcc instructions (je, ja, jae, jb, jbe, je, and jz).
void FCmp(); void FCmp();
......
...@@ -4214,24 +4214,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function, ...@@ -4214,24 +4214,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function,
} }
void MacroAssembler::IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail) {
lw(map, FieldMemOperand(heap_object, HeapObject::kMapOffset));
IsInstanceJSObjectType(map, scratch, fail);
}
void MacroAssembler::IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail) {
lbu(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset));
Branch(fail, lt, scratch, Operand(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE));
Branch(fail, gt, scratch, Operand(LAST_NONCALLABLE_SPEC_OBJECT_TYPE));
}
void MacroAssembler::IsObjectJSStringType(Register object, void MacroAssembler::IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail) { Label* fail) {
......
...@@ -977,16 +977,6 @@ class MacroAssembler: public Assembler { ...@@ -977,16 +977,6 @@ class MacroAssembler: public Assembler {
InvokeFlag flag, InvokeFlag flag,
const CallWrapper& call_wrapper); const CallWrapper& call_wrapper);
void IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail);
void IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail);
void IsObjectJSStringType(Register object, void IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail); Label* fail);
......
...@@ -4217,24 +4217,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function, ...@@ -4217,24 +4217,6 @@ void MacroAssembler::InvokeFunction(Handle<JSFunction> function,
} }
void MacroAssembler::IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail) {
ld(map, FieldMemOperand(heap_object, HeapObject::kMapOffset));
IsInstanceJSObjectType(map, scratch, fail);
}
void MacroAssembler::IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail) {
lbu(scratch, FieldMemOperand(map, Map::kInstanceTypeOffset));
Branch(fail, lt, scratch, Operand(FIRST_NONCALLABLE_SPEC_OBJECT_TYPE));
Branch(fail, gt, scratch, Operand(LAST_NONCALLABLE_SPEC_OBJECT_TYPE));
}
void MacroAssembler::IsObjectJSStringType(Register object, void MacroAssembler::IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail) { Label* fail) {
......
...@@ -1008,15 +1008,6 @@ class MacroAssembler: public Assembler { ...@@ -1008,15 +1008,6 @@ class MacroAssembler: public Assembler {
const CallWrapper& call_wrapper); const CallWrapper& call_wrapper);
void IsObjectJSObjectType(Register heap_object,
Register map,
Register scratch,
Label* fail);
void IsInstanceJSObjectType(Register map,
Register scratch,
Label* fail);
void IsObjectJSStringType(Register object, void IsObjectJSStringType(Register object,
Register scratch, Register scratch,
Label* fail); Label* fail);
......
...@@ -3446,9 +3446,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map, ...@@ -3446,9 +3446,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map,
Label done, loop; Label done, loop;
movp(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset)); movp(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset));
bind(&loop); bind(&loop);
JumpIfSmi(result, &done); JumpIfSmi(result, &done, Label::kNear);
CmpObjectType(result, MAP_TYPE, temp); CmpObjectType(result, MAP_TYPE, temp);
j(not_equal, &done); j(not_equal, &done, Label::kNear);
movp(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset)); movp(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset));
jmp(&loop); jmp(&loop);
bind(&done); bind(&done);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment