Bug 1218652 - IonMonkey: MIPS: Add mips-shared in check macroassembler style. r=arai
authorHeiher <r@hev.cc>
Wed, 28 Oct 2015 07:35:06 +0800
changeset 269734 afa59d4524cca503e93bc1ff12dd97e0d35a018a
parent 269733 421e7471928d373a4a9fa8e00a9eb3abd6e0a52c
child 269735 a5f81cb4dcd7ce902d955281d60c67ba03956ee5
push id67167
push userr@hev.cc
push dateTue, 27 Oct 2015 15:35:32 +0000
treeherdermozilla-inbound@afa59d4524cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersarai
bugs1218652
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1218652 - IonMonkey: MIPS: Add mips-shared in check macroassembler style. r=arai --- config/check_macroassembler_style.py | 2 +- js/src/jit/MacroAssembler.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-)
config/check_macroassembler_style.py
js/src/jit/MacroAssembler.h
--- a/config/check_macroassembler_style.py
+++ b/config/check_macroassembler_style.py
@@ -26,17 +26,17 @@ import difflib
 import os
 import re
 import subprocess
 import sys
 from check_utils import get_all_toplevel_filenames
 
 architecture_independent = set([ 'generic' ])
 all_architecture_names = set([ 'x86', 'x64', 'arm', 'arm64', 'mips32' ])
-all_shared_architecture_names = set([ 'x86_shared', 'arm', 'arm64', 'mips32' ])
+all_shared_architecture_names = set([ 'x86_shared', 'mips_shared', 'arm', 'arm64' ])
 
 reBeforeArg = "(?<=[(,\s])"
 reArgType = "(?P<type>[\w\s:*&]+)"
 reArgName = "(?P<name>\s\w+)"
 reArgDefault = "(?P<default>(?:\s=[^,)]+)?)"
 reAfterArg = "(?=[,)])"
 reMatchArg = re.compile(reBeforeArg + reArgType + reArgName + reArgDefault + reAfterArg)
 
--- a/js/src/jit/MacroAssembler.h
+++ b/js/src/jit/MacroAssembler.h
@@ -58,17 +58,17 @@
 // forgot to define the method in one of the macro assembler, or you forgot to
 // update the annotation of the macro assembler declaration.
 //
 // Some convenient short-cuts are used to avoid repeating the same list of
 // architectures on each method declaration, such as PER_ARCH and
 // PER_SHARED_ARCH.
 
 # define ALL_ARCH mips32, arm, arm64, x86, x64
-# define ALL_SHARED_ARCH mips32, arm, arm64, x86_shared
+# define ALL_SHARED_ARCH arm, arm64, x86_shared, mips_shared
 
 // * How this macro works:
 //
 // DEFINED_ON is a macro which check if, for the current architecture, the
 // method is defined on the macro assembler or not.
 //
 // For each architecutre, we have a macro named DEFINED_ON_arch.  This macro is
 // empty if this is not the current architecture.  Otherwise it must be either
@@ -102,16 +102,17 @@
 // annotation on the method declaration.
 
 # define DEFINED_ON_x86
 # define DEFINED_ON_x64
 # define DEFINED_ON_x86_shared
 # define DEFINED_ON_arm
 # define DEFINED_ON_arm64
 # define DEFINED_ON_mips32
+# define DEFINED_ON_mips_shared
 # define DEFINED_ON_none
 
 // Specialize for each architecture.
 #if defined(JS_CODEGEN_X86)
 # undef DEFINED_ON_x86
 # define DEFINED_ON_x86 define
 # undef DEFINED_ON_x86_shared
 # define DEFINED_ON_x86_shared define
@@ -124,16 +125,18 @@
 # undef DEFINED_ON_arm
 # define DEFINED_ON_arm define
 #elif defined(JS_CODEGEN_ARM64)
 # undef DEFINED_ON_arm64
 # define DEFINED_ON_arm64 define
 #elif defined(JS_CODEGEN_MIPS32)
 # undef DEFINED_ON_mips32
 # define DEFINED_ON_mips32 define
+# undef DEFINED_ON_mips_shared
+# define DEFINED_ON_mips_shared define
 #elif defined(JS_CODEGEN_NONE)
 # undef DEFINED_ON_none
 # define DEFINED_ON_none crash
 #else
 # error "Unknown architecture!"
 #endif
 
 # define DEFINED_ON_RESULT_crash   { MOZ_CRASH(); }