Show
Ignore:
Timestamp:
08/08/08 14:23:27 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35637

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/JavaScriptCore/VM/CodeGenerator.h

    r429 r433  
    231231        RegisterID* emitLoad(RegisterID* dst, double); 
    232232        RegisterID* emitLoad(RegisterID* dst, JSValue*); 
     233        RegisterID* emitUnexpectedLoad(RegisterID* dst, bool); 
    233234 
    234235        RegisterID* emitNullaryOp(OpcodeID, RegisterID* dst); 
    …… 
    376377        unsigned addConstant(FuncExprNode*); 
    377378        unsigned addConstant(const Identifier&); 
    378         unsigned addConstant(JSValue*); 
     379        RegisterID* addConstant(JSValue*); 
     380        unsigned addUnexpectedConstant(JSValue*); 
    379381        unsigned addRegExp(RegExp* r); 
    380382 
    …… 
    397399        RegisterID m_thisRegister; 
    398400        SegmentedVector<RegisterID, 512> m_locals; 
     401        SegmentedVector<RegisterID, 512> m_constants; 
    399402        SegmentedVector<RegisterID, 512> m_temporaries; 
    400403        SegmentedVector<LabelID, 512> m_labels;