<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213376] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213376">213376</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-03-03 13:05:55 -0800 (Fri, 03 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add MacroAssembler::isBreakpoint() query function.
https://bugs.webkit.org/show_bug.cgi?id=169139
Reviewed by Michael Saboff.
This will be needed soon when we use breakpoint instructions to implement
non-polling VM traps, and need to discern between a VM trap signal and a genuine
assertion breakpoint.
* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::isBrk):
(JSC::ARM64Assembler::excepnGenerationImmMask):
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::isBkpt):
* assembler/ARMv7Assembler.h:
(JSC::ARMv7Assembler::isBkpt):
* assembler/MIPSAssembler.h:
(JSC::MIPSAssembler::isBkpt):
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::isBreakpoint):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::isBreakpoint):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::isBreakpoint):
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::isBreakpoint):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::isBreakpoint):
* assembler/X86Assembler.h:
(JSC::X86Assembler::isInt3):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARM64Assemblerh">trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMIPSAssemblerh">trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,38 @@
</span><span class="cx"> 2017-03-03 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Add MacroAssembler::isBreakpoint() query function.
+ https://bugs.webkit.org/show_bug.cgi?id=169139
+
+ Reviewed by Michael Saboff.
+
+ This will be needed soon when we use breakpoint instructions to implement
+ non-polling VM traps, and need to discern between a VM trap signal and a genuine
+ assertion breakpoint.
+
+ * assembler/ARM64Assembler.h:
+ (JSC::ARM64Assembler::isBrk):
+ (JSC::ARM64Assembler::excepnGenerationImmMask):
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::isBkpt):
+ * assembler/ARMv7Assembler.h:
+ (JSC::ARMv7Assembler::isBkpt):
+ * assembler/MIPSAssembler.h:
+ (JSC::MIPSAssembler::isBkpt):
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::isBreakpoint):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::isBreakpoint):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::isBreakpoint):
+ * assembler/MacroAssemblerMIPS.h:
+ (JSC::MacroAssemblerMIPS::isBreakpoint):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::isBreakpoint):
+ * assembler/X86Assembler.h:
+ (JSC::X86Assembler::isInt3):
+
+2017-03-03 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> We should only check for traps that we're able to handle.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169136
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2014, 2017 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -868,6 +868,14 @@
</span><span class="cx"> insn(excepnGeneration(ExcepnOp_BREAKPOINT, imm, 0));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ALWAYS_INLINE static bool isBrk(void* address)
+ {
+ int expected = excepnGeneration(ExcepnOp_BREAKPOINT, 0, 0);
+ int immediateMask = excepnGenerationImmMask();
+ int candidateInstruction = *reinterpret_cast<int*>(address);
+ return (candidateInstruction & ~immediateMask) == expected;
+ }
+
</ins><span class="cx"> template<int datasize>
</span><span class="cx"> ALWAYS_INLINE void cbnz(RegisterID rt, int32_t offset = 0)
</span><span class="cx"> {
</span><span class="lines">@@ -3282,6 +3290,11 @@
</span><span class="cx"> const int op2 = 0;
</span><span class="cx"> return (0xd4000000 | opc << 21 | imm16 << 5 | op2 << 2 | LL);
</span><span class="cx"> }
</span><ins>+ ALWAYS_INLINE static int excepnGenerationImmMask()
+ {
+ uint16_t imm16 = std::numeric_limit<uint16_t>::max();
+ return (static_cast<int>(imm16) << 5);
+ }
</ins><span class="cx">
</span><span class="cx"> ALWAYS_INLINE static int extract(Datasize sf, RegisterID rm, int imms, RegisterID rn, RegisterID rd)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 2009, 2010 University of Szeged
</span><ins>+ * Copyright (C) 2017 Apple Inc.
</ins><span class="cx"> * All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -701,6 +702,14 @@
</span><span class="cx"> m_buffer.putInt(BKPT | ((value & 0xff0) << 4) | (value & 0xf));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBkpt(void* address)
+ {
+ ARMWord expected = BKPT;
+ ARMWord immediateMask = (0xff0 << 4) | 0xf);
+ ARMWord candidateInstruction = *reinterpret_cast<ARMWord*>(address);
+ return (candidateInstruction & ~immediateMask) == expected;
+ }
+
</ins><span class="cx"> void nop()
</span><span class="cx"> {
</span><span class="cx"> m_buffer.putInt(NOP);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009, 2010, 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 University of Szeged
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -987,6 +987,14 @@
</span><span class="cx"> m_formatter.oneWordOp8Imm8(OP_BKPT, imm);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBkpt(void* address)
+ {
+ unsigned short expected = OP_BKPT;
+ unsigned short immediateMask = 0xff;
+ unsigned short candidateInstruction = *reinterpret_cast<unsigned short*>(address);
+ return (candidateInstruction & ~immediateMask) == expected;
+ }
+
</ins><span class="cx"> ALWAYS_INLINE void clz(RegisterID rd, RegisterID rm)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!BadReg(rd));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMIPSAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2009 University of Szeged
</span><span class="cx"> * All rights reserved.
</span><span class="cx"> * Copyright (C) 2010 MIPS Technologies, Inc. All rights reserved.
</span><span class="lines">@@ -447,6 +447,14 @@
</span><span class="cx"> emitInst(0x0000000d | ((value & 0x3ff) << OP_SH_CODE));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBkpt(void* address)
+ {
+ int value = 512; /* BRK_BUG */
+ MIPSWord expected = (0x0000000d | ((value & 0x3ff) << OP_SH_CODE));
+ MIPSWord candidateInstruction = *reinterpret_cast<MIPSWord*>(address);
+ return candidateInstruction == expected;
+ }
+
</ins><span class="cx"> void bgez(RegisterID rs, int imm)
</span><span class="cx"> {
</span><span class="cx"> emitInst(0x04010000 | (rs << OP_SH_RS) | (imm & 0xffff));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2013-2016 Apple Inc.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc.
</ins><span class="cx"> * Copyright (C) 2009, 2010 University of Szeged
</span><span class="cx"> * All rights reserved.
</span><span class="cx"> *
</span><span class="lines">@@ -955,6 +955,8 @@
</span><span class="cx"> m_assembler.bkpt(0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBreakpoint(void* address) { return ARMAssembler::isBkpt(address); }
+
</ins><span class="cx"> Call nearCall()
</span><span class="cx"> {
</span><span class="cx"> m_assembler.loadBranchTarget(ARMRegisters::S1, ARMAssembler::AL, true);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2014-2017 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -3348,6 +3348,8 @@
</span><span class="cx"> m_assembler.brk(imm);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBreakpoint(void* address) { return ARM64Assembler::isBrk(address); }
+
</ins><span class="cx"> void nop()
</span><span class="cx"> {
</span><span class="cx"> m_assembler.nop();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2009-2010, 2014-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2009-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 University of Szeged
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -1752,6 +1752,8 @@
</span><span class="cx"> m_assembler.bkpt(imm);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBreakpoint(void* address) { return ARMv7Assembler::isBkpt(address); }
+
</ins><span class="cx"> ALWAYS_INLINE Call nearCall()
</span><span class="cx"> {
</span><span class="cx"> moveFixedWidthEncoding(TrustedImm32(0), dataTempRegister);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 MIPS Technologies, Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -2158,6 +2158,8 @@
</span><span class="cx"> m_assembler.bkpt();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBreakpoint(void* address) { return MIPSAssembler::isBkpt(address); }
+
</ins><span class="cx"> Call nearCall()
</span><span class="cx"> {
</span><span class="cx"> /* We need two words for relaxation. */
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2014-2017 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -2557,6 +2557,8 @@
</span><span class="cx"> m_assembler.int3();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isBreakpoint(void* address) { return X86Assembler::isInt3(address); }
+
</ins><span class="cx"> Call nearTailCall()
</span><span class="cx"> {
</span><span class="cx"> return Call(m_assembler.jmp(), Call::LinkableNearTail);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (213375 => 213376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2017-03-03 19:38:37 UTC (rev 213375)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2017-03-03 21:05:55 UTC (rev 213376)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2008, 2012-2017 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2008-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -2760,6 +2760,12 @@
</span><span class="cx"> m_formatter.oneByteOp(OP_INT3);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static bool isInt3(void* address)
+ {
+ uint8_t candidateInstruction = *reinterpret_cast<uint8_t*>(address);
+ return candidateInstruction == OP_INT3;
+ }
+
</ins><span class="cx"> void ret()
</span><span class="cx"> {
</span><span class="cx"> m_formatter.oneByteOp(OP_RET);
</span></span></pre>
</div>
</div>
</body>
</html>