From: Joerg Sonnenberger <joerg@bec.de>
Date: Thu, 17 Feb 2011 23:36:39 +0000 (+0000)
Subject: Recognize leavel and leaveq aliases for leave.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=97755a063eb65705e928550b048ecb921c83545c;p=oota-llvm.git

Recognize leavel and leaveq aliases for leave.
Validate encoding of leave in 64bit mode.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@125795 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Target/X86/X86InstrInfo.td b/lib/Target/X86/X86InstrInfo.td
index 14c90662d02..221aa2fdc33 100644
--- a/lib/Target/X86/X86InstrInfo.td
+++ b/lib/Target/X86/X86InstrInfo.td
@@ -1293,6 +1293,9 @@ def : MnemonicAlias<"cdqe", "cltq">;
 // lret maps to lretl, it is not ambiguous with lretq.
 def : MnemonicAlias<"lret", "lretl">;
 
+def : MnemonicAlias<"leavel", "leave">, Requires<[In32BitMode]>;
+def : MnemonicAlias<"leaveq", "leave">, Requires<[In64BitMode]>;
+
 def : MnemonicAlias<"pop", "popl">, Requires<[In32BitMode]>;
 def : MnemonicAlias<"pop", "popq">, Requires<[In64BitMode]>;
 def : MnemonicAlias<"popf", "popfl">, Requires<[In32BitMode]>;
diff --git a/test/MC/X86/x86-32-coverage.s b/test/MC/X86/x86-32-coverage.s
index ea30e8d022f..4ec9fcdb1ee 100644
--- a/test/MC/X86/x86-32-coverage.s
+++ b/test/MC/X86/x86-32-coverage.s
@@ -267,6 +267,9 @@
 // CHECK: 	leave
         	leave
 
+// CHECK: 	leave
+        	leavel
+
 // CHECK: 	seto	%bl
         	seto	%bl
 
@@ -3330,6 +3333,10 @@
 // CHECK:  encoding: [0xc9]
         	leave
 
+// CHECK: leave
+// CHECK:  encoding: [0xc9]
+        	leavel
+
 // CHECK: seto	%bl
 // CHECK:  encoding: [0x0f,0x90,0xc3]
         	seto	%bl
diff --git a/test/MC/X86/x86_64-encoding.s b/test/MC/X86/x86_64-encoding.s
index c071a1b765e..756da4dc352 100644
--- a/test/MC/X86/x86_64-encoding.s
+++ b/test/MC/X86/x86_64-encoding.s
@@ -148,3 +148,10 @@ pshufb	CPI1_0(%rip), %xmm1
 // CHECK: encoding: [0x48,0x0f,0xae,0x08]
           fxrstorq (%rax)
 
+// CHECK: leave
+// CHECK:  encoding: [0xc9]
+        	leave
+
+// CHECK: leave
+// CHECK:  encoding: [0xc9]
+        	leaveq