From 0fce748dc62985298ad354f3e1af2446c376bc36 Mon Sep 17 00:00:00 2001 From: "chunyang.dai" Date: Mon, 7 Sep 2015 01:14:37 -0700 Subject: [PATCH] X87: Remove obsolete functionality from the MacroAssemblers. port 64e3bad3677d01d70ddcedd541619216b973e90d (r30577) original commit message: 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. BUG= Review URL: https://codereview.chromium.org/1321653004 Cr-Commit-Position: refs/heads/master@{#30611} --- src/x87/macro-assembler-x87.cc | 24 ++---------------------- src/x87/macro-assembler-x87.h | 12 ------------ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/src/x87/macro-assembler-x87.cc b/src/x87/macro-assembler-x87.cc index e9d075d2d..d2b174262 100644 --- a/src/x87/macro-assembler-x87.cc +++ b/src/x87/macro-assembler-x87.cc @@ -665,26 +665,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() { fucompp(); push(eax); @@ -1750,9 +1730,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/x87/macro-assembler-x87.h b/src/x87/macro-assembler-x87.h index bb918ea8c..26a721a16 100644 --- a/src/x87/macro-assembler-x87.h +++ b/src/x87/macro-assembler-x87.h @@ -418,18 +418,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(); -- 2.34.1