Changeset 157618 in webkit

Timestamp:

Oct 17, 2013, 7:43:44 PM (13 years ago)

Author:

fpizlo@apple.com

Message:

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARM64Assembler.h (modified) (1 diff)
• assembler/MacroAssemblerARM64.h (modified) (2 diffs)
• assembler/MacroAssemblerARMv7.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/JavaScriptCore/assembler/ARM64Assembler.h

@@ -437 +437 @@
     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:

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h

@@ -55 +55 @@
     }
 
-    typedef ARM64Registers::FPRegisterID FPRegisterID;
     typedef ARM64Assembler::LinkRecord LinkRecord;
     typedef ARM64Assembler::JumpType JumpType;
@@ -126 +125 @@
 
     static const RegisterID stackPointerRegister = ARM64Registers::sp;
+    static const RegisterID framePointerRegister = ARM64Registers::fp;
     static const RegisterID linkRegister = ARM64Registers::lr;
 

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h

@@ -145 +145 @@
 
     static const RegisterID stackPointerRegister = ARMRegisters::sp;
+    static const RegisterID framePointerRegister = ARMRegisters::fp;
     static const RegisterID linkRegister = ARMRegisters::lr;