| Index: src/x87/lithium-codegen-x87.cc
|
| diff --git a/src/x87/lithium-codegen-x87.cc b/src/x87/lithium-codegen-x87.cc
|
| index a7e432ffa66ecfa1474ac3253486c236e9ee3ccc..cc4736cd23223582e07d430b5e48c53d7187879d 100644
|
| --- a/src/x87/lithium-codegen-x87.cc
|
| +++ b/src/x87/lithium-codegen-x87.cc
|
| @@ -18,7 +18,7 @@ namespace internal {
|
|
|
| // When invoking builtins, we need to record the safepoint in the middle of
|
| // the invoke instruction sequence generated by the macro assembler.
|
| -class SafepointGenerator V8_FINAL : public CallWrapper {
|
| +class SafepointGenerator FINAL : public CallWrapper {
|
| public:
|
| SafepointGenerator(LCodeGen* codegen,
|
| LPointerMap* pointers,
|
| @@ -28,9 +28,9 @@ class SafepointGenerator V8_FINAL : public CallWrapper {
|
| deopt_mode_(mode) {}
|
| virtual ~SafepointGenerator() {}
|
|
|
| - virtual void BeforeCall(int call_size) const V8_OVERRIDE {}
|
| + virtual void BeforeCall(int call_size) const OVERRIDE {}
|
|
|
| - virtual void AfterCall() const V8_OVERRIDE {
|
| + virtual void AfterCall() const OVERRIDE {
|
| codegen_->RecordSafepoint(pointers_, deopt_mode_);
|
| }
|
|
|
| @@ -2760,16 +2760,16 @@ void LCodeGen::DoInstanceOf(LInstanceOf* instr) {
|
|
|
|
|
| void LCodeGen::DoInstanceOfKnownGlobal(LInstanceOfKnownGlobal* instr) {
|
| - class DeferredInstanceOfKnownGlobal V8_FINAL : public LDeferredCode {
|
| + class DeferredInstanceOfKnownGlobal FINAL : public LDeferredCode {
|
| public:
|
| DeferredInstanceOfKnownGlobal(LCodeGen* codegen,
|
| LInstanceOfKnownGlobal* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredInstanceOfKnownGlobal(instr_, &map_check_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| Label* map_check() { return &map_check_; }
|
| private:
|
| LInstanceOfKnownGlobal* instr_;
|
| @@ -3685,16 +3685,16 @@ void LCodeGen::EmitIntegerMathAbs(LMathAbs* instr) {
|
|
|
| void LCodeGen::DoMathAbs(LMathAbs* instr) {
|
| // Class for deferred case.
|
| - class DeferredMathAbsTaggedHeapNumber V8_FINAL : public LDeferredCode {
|
| + class DeferredMathAbsTaggedHeapNumber FINAL : public LDeferredCode {
|
| public:
|
| DeferredMathAbsTaggedHeapNumber(LCodeGen* codegen,
|
| LMathAbs* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredMathAbsTaggedHeapNumber(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LMathAbs* instr_;
|
| };
|
| @@ -4246,16 +4246,16 @@ void LCodeGen::DoTransitionElementsKind(LTransitionElementsKind* instr) {
|
|
|
|
|
| void LCodeGen::DoStringCharCodeAt(LStringCharCodeAt* instr) {
|
| - class DeferredStringCharCodeAt V8_FINAL : public LDeferredCode {
|
| + class DeferredStringCharCodeAt FINAL : public LDeferredCode {
|
| public:
|
| DeferredStringCharCodeAt(LCodeGen* codegen,
|
| LStringCharCodeAt* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredStringCharCodeAt(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LStringCharCodeAt* instr_;
|
| };
|
| @@ -4305,16 +4305,16 @@ void LCodeGen::DoDeferredStringCharCodeAt(LStringCharCodeAt* instr) {
|
|
|
|
|
| void LCodeGen::DoStringCharFromCode(LStringCharFromCode* instr) {
|
| - class DeferredStringCharFromCode V8_FINAL : public LDeferredCode {
|
| + class DeferredStringCharFromCode FINAL : public LDeferredCode {
|
| public:
|
| DeferredStringCharFromCode(LCodeGen* codegen,
|
| LStringCharFromCode* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredStringCharFromCode(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LStringCharFromCode* instr_;
|
| };
|
| @@ -4394,17 +4394,17 @@ void LCodeGen::DoUint32ToDouble(LUint32ToDouble* instr) {
|
|
|
|
|
| void LCodeGen::DoNumberTagI(LNumberTagI* instr) {
|
| - class DeferredNumberTagI V8_FINAL : public LDeferredCode {
|
| + class DeferredNumberTagI FINAL : public LDeferredCode {
|
| public:
|
| DeferredNumberTagI(LCodeGen* codegen,
|
| LNumberTagI* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredNumberTagIU(instr_, instr_->value(), instr_->temp(),
|
| SIGNED_INT32);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LNumberTagI* instr_;
|
| };
|
| @@ -4422,17 +4422,17 @@ void LCodeGen::DoNumberTagI(LNumberTagI* instr) {
|
|
|
|
|
| void LCodeGen::DoNumberTagU(LNumberTagU* instr) {
|
| - class DeferredNumberTagU V8_FINAL : public LDeferredCode {
|
| + class DeferredNumberTagU FINAL : public LDeferredCode {
|
| public:
|
| DeferredNumberTagU(LCodeGen* codegen,
|
| LNumberTagU* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredNumberTagIU(instr_, instr_->value(), instr_->temp(),
|
| UNSIGNED_INT32);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LNumberTagU* instr_;
|
| };
|
| @@ -4511,16 +4511,16 @@ void LCodeGen::DoDeferredNumberTagIU(LInstruction* instr,
|
|
|
|
|
| void LCodeGen::DoNumberTagD(LNumberTagD* instr) {
|
| - class DeferredNumberTagD V8_FINAL : public LDeferredCode {
|
| + class DeferredNumberTagD FINAL : public LDeferredCode {
|
| public:
|
| DeferredNumberTagD(LCodeGen* codegen,
|
| LNumberTagD* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredNumberTagD(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LNumberTagD* instr_;
|
| };
|
| @@ -4713,16 +4713,16 @@ void LCodeGen::DoDeferredTaggedToI(LTaggedToI* instr, Label* done) {
|
|
|
|
|
| void LCodeGen::DoTaggedToI(LTaggedToI* instr) {
|
| - class DeferredTaggedToI V8_FINAL : public LDeferredCode {
|
| + class DeferredTaggedToI FINAL : public LDeferredCode {
|
| public:
|
| DeferredTaggedToI(LCodeGen* codegen,
|
| LTaggedToI* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredTaggedToI(instr_, done());
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LTaggedToI* instr_;
|
| };
|
| @@ -4914,7 +4914,7 @@ void LCodeGen::DoDeferredInstanceMigration(LCheckMaps* instr, Register object) {
|
|
|
|
|
| void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| - class DeferredCheckMaps V8_FINAL : public LDeferredCode {
|
| + class DeferredCheckMaps FINAL : public LDeferredCode {
|
| public:
|
| DeferredCheckMaps(LCodeGen* codegen,
|
| LCheckMaps* instr,
|
| @@ -4923,11 +4923,11 @@ void LCodeGen::DoCheckMaps(LCheckMaps* instr) {
|
| : LDeferredCode(codegen, x87_stack), instr_(instr), object_(object) {
|
| SetExit(check_maps());
|
| }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredInstanceMigration(instr_, object_);
|
| }
|
| Label* check_maps() { return &check_maps_; }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LCheckMaps* instr_;
|
| Label check_maps_;
|
| @@ -5117,16 +5117,16 @@ void LCodeGen::DoConstructDouble(LConstructDouble* instr) {
|
|
|
|
|
| void LCodeGen::DoAllocate(LAllocate* instr) {
|
| - class DeferredAllocate V8_FINAL : public LDeferredCode {
|
| + class DeferredAllocate FINAL : public LDeferredCode {
|
| public:
|
| DeferredAllocate(LCodeGen* codegen,
|
| LAllocate* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredAllocate(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LAllocate* instr_;
|
| };
|
| @@ -5488,16 +5488,16 @@ void LCodeGen::DoDeferredStackCheck(LStackCheck* instr) {
|
|
|
|
|
| void LCodeGen::DoStackCheck(LStackCheck* instr) {
|
| - class DeferredStackCheck V8_FINAL : public LDeferredCode {
|
| + class DeferredStackCheck FINAL : public LDeferredCode {
|
| public:
|
| DeferredStackCheck(LCodeGen* codegen,
|
| LStackCheck* instr,
|
| const X87Stack& x87_stack)
|
| : LDeferredCode(codegen, x87_stack), instr_(instr) { }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredStackCheck(instr_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LStackCheck* instr_;
|
| };
|
| @@ -5633,7 +5633,7 @@ void LCodeGen::DoDeferredLoadMutableDouble(LLoadFieldByIndex* instr,
|
|
|
|
|
| void LCodeGen::DoLoadFieldByIndex(LLoadFieldByIndex* instr) {
|
| - class DeferredLoadMutableDouble V8_FINAL : public LDeferredCode {
|
| + class DeferredLoadMutableDouble FINAL : public LDeferredCode {
|
| public:
|
| DeferredLoadMutableDouble(LCodeGen* codegen,
|
| LLoadFieldByIndex* instr,
|
| @@ -5645,10 +5645,10 @@ void LCodeGen::DoLoadFieldByIndex(LLoadFieldByIndex* instr) {
|
| object_(object),
|
| index_(index) {
|
| }
|
| - virtual void Generate() V8_OVERRIDE {
|
| + virtual void Generate() OVERRIDE {
|
| codegen()->DoDeferredLoadMutableDouble(instr_, object_, index_);
|
| }
|
| - virtual LInstruction* instr() V8_OVERRIDE { return instr_; }
|
| + virtual LInstruction* instr() OVERRIDE { return instr_; }
|
| private:
|
| LLoadFieldByIndex* instr_;
|
| Register object_;
|
|
|