From: bmeurer Date: Thu, 3 Sep 2015 20:11:16 +0000 (-0700) Subject: Remove obsolete functionality from the MacroAssemblers. X-Git-Tag: upstream/4.7.83~463 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64e3bad3677d01d70ddcedd541619216b973e90d;p=platform%2Fupstream%2Fv8.git 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} --- diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc index 3572e1c..057a59c 100644 --- a/src/arm/macro-assembler-arm.cc +++ b/src/arm/macro-assembler-arm.cc @@ -1390,26 +1390,6 @@ void MacroAssembler::InvokeFunction(Handle 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, Register scratch, Label* fail) { diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h index 702cedb..d418785 100644 --- a/src/arm/macro-assembler-arm.h +++ b/src/arm/macro-assembler-arm.h @@ -662,15 +662,6 @@ class MacroAssembler: public Assembler { InvokeFlag flag, 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, Register scratch, Label* fail); diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc index a6b130b..b05384d 100644 --- a/src/ia32/macro-assembler-ia32.cc +++ b/src/ia32/macro-assembler-ia32.cc @@ -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() { fucomip(); fstp(0); @@ -1784,9 +1764,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map, Label done, loop; mov(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset)); bind(&loop); - JumpIfSmi(result, &done); + JumpIfSmi(result, &done, Label::kNear); CmpObjectType(result, MAP_TYPE, temp); - j(not_equal, &done); + j(not_equal, &done, Label::kNear); mov(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset)); jmp(&loop); bind(&done); diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h index 8f7cae9..dd90650 100644 --- a/src/ia32/macro-assembler-ia32.h +++ b/src/ia32/macro-assembler-ia32.h @@ -452,18 +452,6 @@ class MacroAssembler: public Assembler { Register map, 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 // jcc instructions (je, ja, jae, jb, jbe, je, and jz). void FCmp(); diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 8a75ae9..9ba814a 100644 --- a/src/mips/macro-assembler-mips.cc +++ b/src/mips/macro-assembler-mips.cc @@ -4214,24 +4214,6 @@ void MacroAssembler::InvokeFunction(Handle 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, Register scratch, Label* fail) { diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h index a126e55..5e1d2c6 100644 --- a/src/mips/macro-assembler-mips.h +++ b/src/mips/macro-assembler-mips.h @@ -977,16 +977,6 @@ class MacroAssembler: public Assembler { InvokeFlag flag, 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, Register scratch, Label* fail); diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index 1e9aebd..a379d84 100644 --- a/src/mips64/macro-assembler-mips64.cc +++ b/src/mips64/macro-assembler-mips64.cc @@ -4217,24 +4217,6 @@ void MacroAssembler::InvokeFunction(Handle 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, Register scratch, Label* fail) { diff --git a/src/mips64/macro-assembler-mips64.h b/src/mips64/macro-assembler-mips64.h index 7691ba4..17e0857 100644 --- a/src/mips64/macro-assembler-mips64.h +++ b/src/mips64/macro-assembler-mips64.h @@ -1008,15 +1008,6 @@ class MacroAssembler: public Assembler { 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, Register scratch, Label* fail); diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 8898f7b..c67d955 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/src/x64/macro-assembler-x64.cc @@ -3446,9 +3446,9 @@ void MacroAssembler::GetMapConstructor(Register result, Register map, Label done, loop; movp(result, FieldOperand(map, Map::kConstructorOrBackPointerOffset)); bind(&loop); - JumpIfSmi(result, &done); + JumpIfSmi(result, &done, Label::kNear); CmpObjectType(result, MAP_TYPE, temp); - j(not_equal, &done); + j(not_equal, &done, Label::kNear); movp(result, FieldOperand(result, Map::kConstructorOrBackPointerOffset)); jmp(&loop); bind(&done);