Changeset 36402 in webkit for trunk/JavaScriptCore/VM/CTI.cpp


Ignore:
Timestamp:
Sep 14, 2008, 1:33:03 AM (17 years ago)
Author:
[email protected]
Message:

2008-09-14 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Cleanup Sampling code.

  • VM/CTI.cpp: (JSC::CTI::emitCall): (JSC::CTI::privateCompileMainPass):
  • VM/CTI.h: (JSC::CTI::execute):
  • VM/SamplingTool.cpp: (JSC::): (JSC::SamplingTool::run): (JSC::SamplingTool::dump):
  • VM/SamplingTool.h: (JSC::SamplingTool::callingHostFunction):
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/VM/CTI.cpp

    r36401 r36402  
    177177
    178178#if ENABLE(SAMPLING_TOOL)
    179 unsigned incall = 0;
     179unsigned inCalledCode = 0;
    180180#endif
    181181
    … …  
    246246{
    247247#if ENABLE(SAMPLING_TOOL)
    248     m_jit.movl_i32m(1, &incall);
     248    m_jit.movl_i32m(1, &inCalledCode);
    249249#endif
    250250    m_calls.append(CallRecord(m_jit.emitCall(), helper, opcodeIndex));
    251251    emitDebugExceptionCheck();
    252252#if ENABLE(SAMPLING_TOOL)
    253     m_jit.movl_i32m(0, &incall);
     253    m_jit.movl_i32m(0, &inCalledCode);
    254254#endif
    255255}
    … …  
    258258{
    259259#if ENABLE(SAMPLING_TOOL)
    260     m_jit.movl_i32m(1, &incall);
     260    m_jit.movl_i32m(1, &inCalledCode);
    261261#endif
    262262    m_calls.append(CallRecord(m_jit.emitCall(), helper, opcodeIndex));
    263263    emitDebugExceptionCheck();
    264264#if ENABLE(SAMPLING_TOOL)
    265     m_jit.movl_i32m(0, &incall);
     265    m_jit.movl_i32m(0, &inCalledCode);
    266266#endif
    267267}
    … …  
    270270{
    271271#if ENABLE(SAMPLING_TOOL)
    272     m_jit.movl_i32m(1, &incall);
     272    m_jit.movl_i32m(1, &inCalledCode);
    273273#endif
    274274    m_calls.append(CallRecord(m_jit.emitCall(), helper, opcodeIndex));
    275275    emitDebugExceptionCheck();
    276276#if ENABLE(SAMPLING_TOOL)
    277     m_jit.movl_i32m(0, &incall);
     277    m_jit.movl_i32m(0, &inCalledCode);
    278278#endif
    279279}
    … …  
    282282{
    283283#if ENABLE(SAMPLING_TOOL)
    284     m_jit.movl_i32m(1, &incall);
     284    m_jit.movl_i32m(1, &inCalledCode);
    285285#endif
    286286    m_calls.append(CallRecord(m_jit.emitCall(), helper, opcodeIndex));
    287287    emitDebugExceptionCheck();
    288288#if ENABLE(SAMPLING_TOOL)
    289     m_jit.movl_i32m(0, &incall);
     289    m_jit.movl_i32m(0, &inCalledCode);
    290290#endif
    291291}
    … …  
    294294{
    295295#if ENABLE(SAMPLING_TOOL)
    296     m_jit.movl_i32m(1, &incall);
     296    m_jit.movl_i32m(1, &inCalledCode);
    297297#endif
    298298    m_calls.append(CallRecord(m_jit.emitCall(), helper, opcodeIndex));
    299299    emitDebugExceptionCheck();
    300300#if ENABLE(SAMPLING_TOOL)
    301     m_jit.movl_i32m(0, &incall);
     301    m_jit.movl_i32m(0, &inCalledCode);
    302302#endif
    303303}
    … …  
    376376
    377377#if ENABLE(SAMPLING_TOOL)
    378 OpcodeID what = (OpcodeID)-1;
     378OpcodeID currentOpcodeID = static_cast<OpcodeID>(-1);
    379379#endif
    380380
    … …  
    465465
    466466#if ENABLE(SAMPLING_TOOL)
    467         m_jit.movl_i32m(m_machine->getOpcodeID(instruction[i].u.opcode), &what);
     467        m_jit.movl_i32m(m_machine->getOpcodeID(instruction[i].u.opcode), &currentOpcodeID);
    468468#endif
    469469
    … …  
    519519            emitGetArg(instruction[i + 1].u.operand, X86::eax);
    520520#if ENABLE(SAMPLING_TOOL)
    521             m_jit.movl_i32m(-1, &what);
     521            m_jit.movl_i32m(-1, &currentOpcodeID);
    522522#endif
    523523            m_jit.pushl_m(-((m_codeBlock->numLocals + RegisterFile::CallFrameHeaderSize) - RegisterFile::CTIReturnEIP) * sizeof(Register), X86::edi);
Note: See TracChangeset for help on using the changeset viewer.