Title: [213709] trunk/Source/_javascript_Core
- Revision
- 213709
- Author
- o...@webkit.org
- Date
- 2017-03-10 05:32:18 -0800 (Fri, 10 Mar 2017)
Log Message
Unreviewed ARM buildfix after r213652.
https://bugs.webkit.org/show_bug.cgi?id=168920
r213652 used replaceWithBrk and replaceWithBkpt names for the same
function, which was inconsistent and caused build error in ARMAssembler.
* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
(JSC::ARM64Assembler::replaceWithBrk): Deleted.
* assembler/ARMAssembler.h:
(JSC::ARMAssembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
(JSC::ARMAssembler::replaceWithBrk): Deleted.
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::replaceWithBreakpoint):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (213708 => 213709)
--- trunk/Source/_javascript_Core/ChangeLog 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-03-10 13:32:18 UTC (rev 213709)
@@ -1,3 +1,20 @@
+2017-03-10 Csaba Osztrogonác <o...@webkit.org>
+
+ Unreviewed ARM buildfix after r213652.
+ https://bugs.webkit.org/show_bug.cgi?id=168920
+
+ r213652 used replaceWithBrk and replaceWithBkpt names for the same
+ function, which was inconsistent and caused build error in ARMAssembler.
+
+ * assembler/ARM64Assembler.h:
+ (JSC::ARM64Assembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
+ (JSC::ARM64Assembler::replaceWithBrk): Deleted.
+ * assembler/ARMAssembler.h:
+ (JSC::ARMAssembler::replaceWithBkpt): Renamed replaceWithBrk to replaceWithBkpt.
+ (JSC::ARMAssembler::replaceWithBrk): Deleted.
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::replaceWithBreakpoint):
+
2017-03-10 Alex Christensen <achristen...@webkit.org>
Win64 build fix.
Modified: trunk/Source/_javascript_Core/assembler/ARM64Assembler.h (213708 => 213709)
--- trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/_javascript_Core/assembler/ARM64Assembler.h 2017-03-10 13:32:18 UTC (rev 213709)
@@ -2536,7 +2536,7 @@
linkPointer(addressOf(code, where), valuePtr);
}
- static void replaceWithBrk(void* where)
+ static void replaceWithBkpt(void* where)
{
int insn = excepnGeneration(ExcepnOp_BREAKPOINT, 0, 0);
performJITMemcpy(where, &insn, sizeof(int));
Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (213708 => 213709)
--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2017-03-10 13:32:18 UTC (rev 213709)
@@ -995,7 +995,7 @@
return reinterpret_cast<void*>(readPointer(reinterpret_cast<void*>(getAbsoluteJumpAddress(from))));
}
- static void replaceWithBrk(void* instructionStart)
+ static void replaceWithBkpt(void* instructionStart)
{
ARMWord* instruction = reinterpret_cast<ARMWord*>(instructionStart);
instruction[0] = BKPT;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (213708 => 213709)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2017-03-10 13:02:16 UTC (rev 213708)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2017-03-10 13:32:18 UTC (rev 213709)
@@ -3408,7 +3408,7 @@
static void replaceWithBreakpoint(CodeLocationLabel instructionStart)
{
- ARM64Assembler::replaceWithBrk(instructionStart.executableAddress());
+ ARM64Assembler::replaceWithBkpt(instructionStart.executableAddress());
}
static void replaceWithJump(CodeLocationLabel instructionStart, CodeLocationLabel destination)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
