commit 7a21458de51629fb495dcb0613eb5660649bad65
author fpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Oct 18 02:43:44 2013 +0000
committer fpizlo@apple.com <fpizlo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Oct 18 02:43:44 2013 +0000
tree 4f049d4f1474a4bfcf33d6fe8d87b58f968cc0dc
parent 9c961bc36aab21d15518396f429db292456a12e6

Unreviewed, speculative ARM build fix.
https://bugs.webkit.org/show_bug.cgi?id=122890
<rdar://problem/15258624>

* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::firstRegister):
(JSC::ARM64Assembler::lastRegister):
(JSC::ARM64Assembler::firstFPRegister):
(JSC::ARM64Assembler::lastFPRegister):
* assembler/MacroAssemblerARM64.h:
* assembler/MacroAssemblerARMv7.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@157618 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 2af450d..e8f289b 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2013-10-17  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, speculative ARM build fix.
+        https://bugs.webkit.org/show_bug.cgi?id=122890
+        <rdar://problem/15258624>
+
+        * assembler/ARM64Assembler.h:
+        (JSC::ARM64Assembler::firstRegister):
+        (JSC::ARM64Assembler::lastRegister):
+        (JSC::ARM64Assembler::firstFPRegister):
+        (JSC::ARM64Assembler::lastFPRegister):
+        * assembler/MacroAssemblerARM64.h:
+        * assembler/MacroAssemblerARMv7.h:
+
 2013-10-17  Andreas Kling  <akling@apple.com>
 
         Pass VM instead of JSGlobalObject to JSONObject constructor.

Source/JavaScriptCore/assembler/ARM64Assembler.h

diff --git a/Source/JavaScriptCore/assembler/ARM64Assembler.h b/Source/JavaScriptCore/assembler/ARM64Assembler.h
index ddb85f7..55f2eaf 100644
--- a/Source/JavaScriptCore/assembler/ARM64Assembler.h
+++ b/Source/JavaScriptCore/assembler/ARM64Assembler.h
@@ -436,6 +436,12 @@
 public:
     typedef ARM64Registers::RegisterID RegisterID;
     typedef ARM64Registers::FPRegisterID FPRegisterID;
+    
+    static RegisterID firstRegister() { return ARM64Registers::x0; }
+    static RegisterID lastRegister() { return ARM64Registers::x28; }
+    
+    static FPRegisterID firstFPRegister() { return ARM64Registers::q0; }
+    static FPRegisterID lastFPRegister() { return ARM64Registers::q31; }
 
 private:
     static bool isSp(RegisterID reg) { return ARM64Registers::isSp(reg); }

Source/JavaScriptCore/assembler/MacroAssemblerARM64.h

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
index 8e6c163..9e3b17e 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
@@ -54,7 +54,6 @@
     {
     }
 
-    typedef ARM64Registers::FPRegisterID FPRegisterID;
     typedef ARM64Assembler::LinkRecord LinkRecord;
     typedef ARM64Assembler::JumpType JumpType;
     typedef ARM64Assembler::JumpLinkType JumpLinkType;
@@ -125,6 +124,7 @@
     };
 
     static const RegisterID stackPointerRegister = ARM64Registers::sp;
+    static const RegisterID framePointerRegister = ARM64Registers::fp;
     static const RegisterID linkRegister = ARM64Registers::lr;
 
 

Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
index 94a82c9..183b44e 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h
@@ -144,6 +144,7 @@
     };
 
     static const RegisterID stackPointerRegister = ARMRegisters::sp;
+    static const RegisterID framePointerRegister = ARMRegisters::fp;
     static const RegisterID linkRegister = ARMRegisters::lr;
 
     // Integer arithmetic operations: