Changeset 99525 in webkit


Ignore:
Timestamp:
Nov 7, 2011 10:51:43 PM (12 years ago)
Author:
yuqiang.xian@intel.com
Message:

Fix gcc 4.4 compilation warnings in DFG 32_64
https://bugs.webkit.org/show_bug.cgi?id=71762

Reviewed by Filip Pizlo.

  • dfg/DFGJITCodeGenerator.h:

(JSC::DFG::JITCodeGenerator::registersMatched):

Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r99519 r99525  
     12011-11-07  Yuqiang Xian  <yuqiang.xian@intel.com>
     2
     3        Fix gcc 4.4 compilation warnings in DFG 32_64
     4        https://bugs.webkit.org/show_bug.cgi?id=71762
     5
     6        Reviewed by Filip Pizlo.
     7
     8        * dfg/DFGJITCodeGenerator.h:
     9        (JSC::DFG::JITCodeGenerator::registersMatched):
     10
    1112011-11-07  Filip Pizlo  <fpizlo@apple.com>
    212
  • trunk/Source/JavaScriptCore/dfg/DFGJITCodeGenerator.h

    r99502 r99525  
    269269        ASSERT(info.registerFormat() != DataFormatDouble);
    270270        ASSERT(info.registerFormat() != DataFormatJSDouble);
    271         return !(info.registerFormat() & DataFormatJS) ? (info.gpr() == exclude || info.gpr() == exclude2) :  (info.tagGPR() == exclude || info.tagGPR() == exclude2 || info.payloadGPR() == exclude || info.payloadGPR() == exclude2);
     271
     272        if (exclude == InvalidGPRReg && exclude2 == InvalidGPRReg)
     273            return false;
     274
     275        bool matched = false;
     276        if (exclude2 == InvalidGPRReg)
     277            matched = (!(info.registerFormat() & DataFormatJS)) ? (info.gpr() == exclude) :  (info.tagGPR() == exclude || info.payloadGPR() == exclude);
     278        else if (exclude == InvalidGPRReg)
     279            matched = (!(info.registerFormat() & DataFormatJS)) ? (info.gpr() == exclude2) :  (info.tagGPR() == exclude2 || info.payloadGPR() == exclude2);
     280        else
     281            matched = (!(info.registerFormat() & DataFormatJS)) ? (info.gpr() == exclude || info.gpr() == exclude2) :  (info.tagGPR() == exclude || info.tagGPR() == exclude2 || info.payloadGPR() == exclude || info.payloadGPR() == exclude2);
     282        return matched;
    272283    }
    273284#endif
Note: See TracChangeset for help on using the changeset viewer.