summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/assembler/AbstractMacroAssembler.h')
-rw-r--r--Source/JavaScriptCore/assembler/AbstractMacroAssembler.h24
1 files changed, 10 insertions, 14 deletions
diff --git a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
index a0039cb52..27b8a58d1 100644
--- a/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
+++ b/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2012 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -48,6 +48,7 @@ namespace JSC {
class LinkBuffer;
class RepatchBuffer;
+class Watchpoint;
namespace DFG {
class CorrectableJumpPoint;
}
@@ -70,7 +71,6 @@ public:
// The following types are used as operands to MacroAssembler operations,
// describing immediate and memory operands to the instructions to be planted.
-
enum Scale {
TimesOne,
TimesTwo,
@@ -279,6 +279,7 @@ public:
friend class Jump;
friend class MacroAssemblerCodeRef;
friend class LinkBuffer;
+ friend class Watchpoint;
public:
Label()
@@ -559,6 +560,13 @@ public:
return Label(this);
}
+ Label watchpointLabel()
+ {
+ Label result;
+ result.m_label = m_assembler.labelForWatchpoint();
+ return result;
+ }
+
Label align()
{
m_assembler.align(16);
@@ -655,18 +663,6 @@ protected:
{
return AssemblerType::readPointer(dataLabelPtr.dataLocation());
}
-
- static void unreachableForPlatform()
- {
-#if COMPILER(CLANG)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wmissing-noreturn"
- ASSERT_NOT_REACHED();
-#pragma clang diagnostic pop
-#else
- ASSERT_NOT_REACHED();
-#endif
- }
};
} // namespace JSC