Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 969375 - Enable IonMonkey on MIPS. r=jandem,glandium

Browse Source
This commit is contained in:
Branislav Rankov 2014-08-26 17:11:54 +02:00
parent 425239e22d
commit 450cbba4fd
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/src/configure.in
View File

@ -212,6 +212,9 @@ if test -n "$gonkdir" ; then
i?86)
ARCH_DIR=arch-x86
;;
mips*)
ARCH_DIR=arch-mips
;;
esac
CPPFLAGS="-DANDROID -isystem $gonkdir/bionic/libc/$ARCH_DIR/include -isystem $gonkdir/bionic/libc/include/ -isystem $gonkdir/bionic/libc/kernel/common -isystem $gonkdir/bionic/libc/kernel/$ARCH_DIR -isystem $gonkdir/bionic/libm/include -I$gonkdir/frameworks/base/native/include -I$gonkdir/system/core/include -isystem $gonkdir/bionic $CPPFLAGS -I$gonkdir/external/valgrind/fxos-include"
@ -2029,6 +2032,7 @@ powerpc-*)
AC_DEFINE(JS_NUNBOX32)
;;
mips*-*)
ENABLE_ION=1
AC_DEFINE(JS_CPU_MIPS)
AC_DEFINE(JS_NUNBOX32)
;;
@ -3179,6 +3183,14 @@ MOZ_ARG_ENABLE_BOOL(arm-simulator,
[ --enable-arm-simulator Enable ARM simulator for JIT code],
JS_ARM_SIMULATOR=1,
JS_ARM_SIMULATOR= )
MOZ_ARG_ENABLE_BOOL(mips-simulator,
[ --enable-mips-simulator Enable MIPS simulator for JIT code],
JS_MIPS_SIMULATOR=1,
JS_MIPS_SIMULATOR= )
if test -n "$JS_ARM_SIMULATOR" && test -n "$JS_MIPS_SIMULATOR"; then
AC_MSG_ERROR([Flags --enable-arm-simulator and --enable-mips-simulator cannot be used together.])
fi
if test -z "$ENABLE_ION"; then
AC_DEFINE(JS_CODEGEN_NONE)
@ -3190,6 +3202,13 @@ elif test -n "$JS_ARM_SIMULATOR"; then
AC_DEFINE(JS_ARM_SIMULATOR)
AC_DEFINE(JS_CODEGEN_ARM)
JS_CODEGEN_ARM=1
elif test -n "$JS_MIPS_SIMULATOR"; then
if test "$CPU_ARCH" != "x86"; then
AC_MSG_ERROR([The MIPS simulator only works on x86.])
fi
AC_DEFINE(JS_MIPS_SIMULATOR)
AC_DEFINE(JS_CODEGEN_MIPS)
JS_CODEGEN_MIPS=1
elif test "$CPU_ARCH" = "x86"; then
AC_DEFINE(JS_CODEGEN_X86)
JS_CODEGEN_X86=1
@ -3199,10 +3218,15 @@ elif test "$CPU_ARCH" = "x86_64"; then
elif test "$CPU_ARCH" = "arm"; then
AC_DEFINE(JS_CODEGEN_ARM)
JS_CODEGEN_ARM=1
elif test "$CPU_ARCH" = "mips"; then
AC_DEFINE(JS_CODEGEN_MIPS)
JS_CODEGEN_MIPS=1
fi
AC_SUBST(JS_ARM_SIMULATOR)
AC_SUBST(JS_MIPS_SIMULATOR)
AC_SUBST(JS_CODEGEN_ARM)
AC_SUBST(JS_CODEGEN_MIPS)
AC_SUBST(JS_CODEGEN_X86)
AC_SUBST(JS_CODEGEN_X64)
AC_SUBST(JS_CODEGEN_NONE)

17
js/src/moz.build
View File

@ -364,6 +364,23 @@ elif CONFIG['JS_CODEGEN_ARM']:
UNIFIED_SOURCES += [
'jit/arm/Simulator-arm.cpp'
]
elif CONFIG['JS_CODEGEN_MIPS']:
UNIFIED_SOURCES += [
'jit/mips/Architecture-mips.cpp',
'jit/mips/Assembler-mips.cpp',
'jit/mips/Bailouts-mips.cpp',
'jit/mips/BaselineCompiler-mips.cpp',
'jit/mips/BaselineIC-mips.cpp',
'jit/mips/CodeGenerator-mips.cpp',
'jit/mips/Lowering-mips.cpp',
'jit/mips/MacroAssembler-mips.cpp',
'jit/mips/MoveEmitter-mips.cpp',
'jit/mips/Trampoline-mips.cpp',
]
if CONFIG['JS_MIPS_SIMULATOR']:
UNIFIED_SOURCES += [
'jit/mips/Simulator-mips.cpp'
]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [