Bug 1046585 part 3 - Move ExecutableAllocator into jit/. r=sunfish

--HG--
rename : js/src/assembler/jit/ExecutableAllocator.cpp => js/src/jit/ExecutableAllocator.cpp
rename : js/src/assembler/jit/ExecutableAllocator.h => js/src/jit/ExecutableAllocator.h
rename : js/src/assembler/jit/ExecutableAllocatorPosix.cpp => js/src/jit/ExecutableAllocatorPosix.cpp
rename : js/src/assembler/jit/ExecutableAllocatorWin.cpp => js/src/jit/ExecutableAllocatorWin.cpp

js/src/assembler/assembler/AssemblerBuffer.h

@@ -36,13 +36,13 @@
 
 #include <string.h>
 #include <limits.h>
-#include "assembler/jit/ExecutableAllocator.h"
-
 #include <stdarg.h>
+
 #include "jsfriendapi.h"
 #include "jsopcode.h"
 #include "jsutil.h"
 
+#include "jit/ExecutableAllocator.h"
 #include "jit/IonSpewer.h"
 #include "js/RootingAPI.h"
 

js/src/jit/ExecutableAllocator.cpp

@@ -25,7 +25,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "assembler/jit/ExecutableAllocator.h"
+#include "jit/ExecutableAllocator.h"
 
 #include "js/MemoryMetrics.h"
 

js/src/jit/ExecutableAllocatorPosix.cpp

@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "assembler/jit/ExecutableAllocator.h"
+#include "jit/ExecutableAllocator.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_UNIX && !WTF_OS_SYMBIAN
 

js/src/jit/ExecutableAllocatorWin.cpp

@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "assembler/jit/ExecutableAllocator.h"
+#include "jit/ExecutableAllocator.h"
 
 #if ENABLE_ASSEMBLER && WTF_OS_WINDOWS
 

js/src/jit/IonCode.h

@@ -14,8 +14,8 @@
 #include "jsinfer.h"
 #include "jstypes.h"
 
-#include "assembler/jit/ExecutableAllocator.h"
 #include "gc/Heap.h"
+#include "jit/ExecutableAllocator.h"
 #include "jit/IonOptimizationLevels.h"
 #include "jit/IonTypes.h"
 

js/src/jit/IonLinker.h

@@ -11,7 +11,7 @@
 #include "jscompartment.h"
 #include "jsgc.h"
 
-#include "assembler/jit/ExecutableAllocator.h"
+#include "jit/ExecutableAllocator.h"
 #include "jit/IonCode.h"
 #include "jit/IonMacroAssembler.h"
 #include "jit/JitCompartment.h"

js/src/jit/arm/Assembler-arm.cpp

@@ -12,9 +12,9 @@
 #include "jscompartment.h"
 #include "jsutil.h"
 
-#include "assembler/jit/ExecutableAllocator.h"
 #include "gc/Marking.h"
 #include "jit/arm/MacroAssembler-arm.h"
+#include "jit/ExecutableAllocator.h"
 #include "jit/JitCompartment.h"
 
 using namespace js;

js/src/jit/mips/Assembler-mips.cpp

@@ -12,8 +12,8 @@
 #include "jscompartment.h"
 #include "jsutil.h"
 
-#include "assembler/jit/ExecutableAllocator.h"
 #include "gc/Marking.h"
+#include "jit/ExecutableAllocator.h"
 #include "jit/JitCompartment.h"
 
 using mozilla::DebugOnly;

js/src/jit/none/BaseMacroAssembler-none.h

@@ -17,6 +17,7 @@ namespace JSC {
 
 class MacroAssemblerNone
 {
+  public:
     static bool supportsFloatingPoint() { return false; }
 };
 

js/src/moz.build

@@ -102,7 +102,6 @@ UNIFIED_SOURCES += [
     'asmjs/AsmJSModule.cpp',
     'asmjs/AsmJSSignalHandlers.cpp',
     'asmjs/AsmJSValidate.cpp',
-    'assembler/jit/ExecutableAllocator.cpp',
     'builtin/Eval.cpp',
     'builtin/Intl.cpp',
     'builtin/MapObject.cpp',
@@ -159,6 +158,7 @@ UNIFIED_SOURCES += [
     'jit/CompileWrappers.cpp',
     'jit/EdgeCaseAnalysis.cpp',
     'jit/EffectiveAddressAnalysis.cpp',
+    'jit/ExecutableAllocator.cpp',
     'jit/Ion.cpp',
     'jit/IonAnalysis.cpp',
     'jit/IonBuilder.cpp',
@@ -363,13 +363,13 @@ elif CONFIG['JS_CODEGEN_ARM']:
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
-        'assembler/jit/ExecutableAllocatorWin.cpp',
+        'jit/ExecutableAllocatorWin.cpp',
     ]
     # _CRT_RAND_S must be #defined before #including stdlib.h to get rand_s()
     DEFINES['_CRT_RAND_S'] = True
 else:
     SOURCES += [
-        'assembler/jit/ExecutableAllocatorPosix.cpp',
+        'jit/ExecutableAllocatorPosix.cpp',
     ]
 
 if CONFIG['ENABLE_ION']: