| commit | 95894333423e19f1e25229d3345f92b186cba575 | [log] [tgz] |
|---|---|---|
| author | msaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Wed Jan 29 19:18:54 2014 +0000 |
| committer | msaboff@apple.com <msaboff@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> | Wed Jan 29 19:18:54 2014 +0000 |
| tree | 974339f55fc2bf941117018dec4929db24c09e38 | |
| parent | 9b465df54d80545485c7720a45ebf2ce89832cfe [diff] [blame] |
Merge the jsCStack branch https://bugs.webkit.org/show_bug.cgi?id=127763 Reviewed by Mark Hahnenberg. Source/JavaScriptCore: Changes from http://svn.webkit.org/repository/webkit/branches/jsCStack up to changeset 162958. Source/WebCore: Changes from http://svn.webkit.org/repository/webkit/branches/jsCStack up to changeset 162958. Source/WTF: Changes from http://svn.webkit.org/repository/webkit/branches/jsCStack up to changeset 162958. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@163027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/offlineasm/instructions.rb b/Source/JavaScriptCore/offlineasm/instructions.rb index 5a3463f..989ee82 100644 --- a/Source/JavaScriptCore/offlineasm/instructions.rb +++ b/Source/JavaScriptCore/offlineasm/instructions.rb
@@ -258,6 +258,11 @@ "idivi" ] +ARM_INSTRUCTIONS = + [ + "clrbp" + ] + ARM64_INSTRUCTIONS = [ "popLRAndFP", # ARM64 requires registers to be pushed and popped in pairs, @@ -313,7 +318,7 @@ "cloopDo", # no operands ] -INSTRUCTIONS = MACRO_INSTRUCTIONS + X86_INSTRUCTIONS + ARM64_INSTRUCTIONS + RISC_INSTRUCTIONS + MIPS_INSTRUCTIONS + SH4_INSTRUCTIONS + CXX_INSTRUCTIONS +INSTRUCTIONS = MACRO_INSTRUCTIONS + X86_INSTRUCTIONS + ARM_INSTRUCTIONS + ARM64_INSTRUCTIONS + RISC_INSTRUCTIONS + MIPS_INSTRUCTIONS + SH4_INSTRUCTIONS + CXX_INSTRUCTIONS INSTRUCTION_PATTERN = Regexp.new('\\A((' + INSTRUCTIONS.join(')|(') + '))\\Z')