Attachment 152187 Details for Bug 197058 – arm patches, upstream version

[patch] arm patches, upstream version

spidermonkey24_arm.diff (text/plain), 5.09 KB, created by Jan Beich on 2015-01-26 17:10:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2015-01-26 17:10:19 UTC

Size: 5.09 KB

patch

obsolete

>Index: lang/spidermonkey24/files/patch-bug919968
>===================================================================
>--- lang/spidermonkey24/files/patch-bug919968	(revision 0)
>+++ lang/spidermonkey24/files/patch-bug919968	(working copy)
>@@ -0,0 +1,65 @@
>+--- jit/AsmJSSignalHandlers.cpp~
>++++ jit/AsmJSSignalHandlers.cpp
>+@@ -64,7 +64,6 @@ using JS::GenericNaN;
>+ #  define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_PC])
>+ # endif
>+ # define RIP_sig(p) ((p)->uc_mcontext.gregs[REG_RIP])
>+-# define PC_sig(p) ((p)->uc_mcontext.arm_pc)
>+ # define RAX_sig(p) ((p)->uc_mcontext.gregs[REG_RAX])
>+ # define RCX_sig(p) ((p)->uc_mcontext.gregs[REG_RCX])
>+ # define RDX_sig(p) ((p)->uc_mcontext.gregs[REG_RDX])
>+@@ -80,7 +79,11 @@ using JS::GenericNaN;
>+ # define R12_sig(p) ((p)->uc_mcontext.gregs[REG_R12])
>+ # define R13_sig(p) ((p)->uc_mcontext.gregs[REG_R13])
>+ # define R14_sig(p) ((p)->uc_mcontext.gregs[REG_R14])
>+-# define R15_sig(p) ((p)->uc_mcontext.gregs[REG_R15])
>++# if defined(__linux__) && defined(__arm__)
>++#  define R15_sig(p) ((p)->uc_mcontext.arm_pc)
>++# else
>++#  define R15_sig(p) ((p)->uc_mcontext.gregs[REG_R15])
>++# endif
>+ #elif defined(__NetBSD__)
>+ # define XMM_sig(p,i) (((struct fxsave64 *)(p)->uc_mcontext.__fpregs)->fx_xmm[i])
>+ # define EIP_sig(p) ((p)->uc_mcontext.__gregs[_REG_EIP])
>+@@ -124,7 +127,11 @@ using JS::GenericNaN;
>+ # define R12_sig(p) ((p)->uc_mcontext.mc_r12)
>+ # define R13_sig(p) ((p)->uc_mcontext.mc_r13)
>+ # define R14_sig(p) ((p)->uc_mcontext.mc_r14)
>+-# define R15_sig(p) ((p)->uc_mcontext.mc_r15)
>++# if defined(__FreeBSD__) && defined(__arm__)
>++#  define R15_sig(p) ((p)->uc_mcontext.__gregs[_REG_R15])
>++# else
>++#  define R15_sig(p) ((p)->uc_mcontext.mc_r15)
>++# endif
>+ #elif defined(XP_MACOSX)
>+ // Mach requires special treatment.
>+ #else
>+@@ -325,20 +332,20 @@ enum { REG_EIP = 14 };
>+ #  define CONTEXT ucontext_t
>+ # endif
>+ 
>++# if defined(JS_CPU_X64)
>++#  define PC_sig(p) RIP_sig(p)
>++# elif defined(JS_CPU_X86)
>++#  define PC_sig(p) EIP_sig(p)
>++# elif defined(JS_CPU_ARM)
>++#  define PC_sig(p) R15_sig(p)
>++# endif
>++
>+ # if !defined(XP_MACOSX)
>+ static uint8_t **
>+ ContextToPC(CONTEXT *context)
>+ {
>+-#  if defined(JS_CPU_X64)
>+-    JS_STATIC_ASSERT(sizeof(RIP_sig(context)) == sizeof(void*));
>+-    return reinterpret_cast<uint8_t**>(&RIP_sig(context));
>+-#  elif defined(JS_CPU_X86)
>+-    JS_STATIC_ASSERT(sizeof(EIP_sig(context)) == sizeof(void*));
>+-    return reinterpret_cast<uint8_t**>(&EIP_sig(context));
>+-#  elif defined(JS_CPU_ARM)
>+     JS_STATIC_ASSERT(sizeof(PC_sig(context)) == sizeof(void*));
>+     return reinterpret_cast<uint8_t**>(&PC_sig(context));
>+-#  endif
>+ }
>+ 
>+ #  if defined(JS_CPU_X64)
>
>Property changes on: lang/spidermonkey24/files/patch-bug919968
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/spidermonkey24/files/patch-bug1125579
>===================================================================
>--- lang/spidermonkey24/files/patch-bug1125579	(revision 0)
>+++ lang/spidermonkey24/files/patch-bug1125579	(working copy)
>@@ -0,0 +1,14 @@
>+--- assembler/jit/ExecutableAllocator.h~
>++++ assembler/jit/ExecutableAllocator.h
>+@@ -454,6 +454,11 @@ public:
>+     {
>+         User::IMB_Range(code, static_cast<char*>(code) + size);
>+     }
>++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_FREEBSD || WTF_OS_NETBSD)
>++    static void cacheFlush(void* code, size_t size)
>++    {
>++	__clear_cache(code, reinterpret_cast<char*>(code) + size);
>++    }
>+ #elif WTF_CPU_ARM_TRADITIONAL && WTF_OS_LINUX && WTF_COMPILER_RVCT
>+     static __asm void cacheFlush(void* code, size_t size);
>+ #elif WTF_CPU_ARM_TRADITIONAL && (WTF_OS_LINUX || WTF_OS_ANDROID) && WTF_COMPILER_GCC
>
>Property changes on: lang/spidermonkey24/files/patch-bug1125579
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: lang/spidermonkey24/files/patch-bug1125580
>===================================================================
>--- lang/spidermonkey24/files/patch-bug1125580	(revision 0)
>+++ lang/spidermonkey24/files/patch-bug1125580	(working copy)
>@@ -0,0 +1,11 @@
>+--- jit/arm/Architecture-arm.cpp~
>++++ jit/arm/Architecture-arm.cpp
>+@@ -15,7 +15,7 @@
>+ 
>+ // lame check for kernel version
>+ // see bug 586550
>+-#if !(defined(ANDROID) || defined(MOZ_B2G))
>++#if defined(__linux__) && !defined(ANDROID) && !defined(MOZ_B2G)
>+ #include <asm/hwcap.h>
>+ #else
>+ #define HWCAP_VFP      (1<<0)
>
>Property changes on: lang/spidermonkey24/files/patch-bug1125580
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 197058: 152112 | 152187