[llvm-branch-commits] [llvm-branch] r261031 - Merging r260390:
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Feb 16 15:22:17 PST 2016
Author: hans
Date: Tue Feb 16 17:22:17 2016
New Revision: 261031
URL: http://llvm.org/viewvc/llvm-project?rev=261031&view=rev
Log:
Merging r260390:
------------------------------------------------------------------------
r260390 | jyknight | 2016-02-10 09:47:20 -0800 (Wed, 10 Feb 2016) | 12 lines
[SPARC] Repair floating-point condition encodings in assembly parser.
The encodings for floating point conditions A(lways) and N(ever) were
incorrectly specified for the assembly parser, per Sparc manual v8 page
121. This change corrects that mistake.
Also, strangely, all of the branch instructions already had MC test
cases, except for the broken ones. Added the tests.
Patch by Chris Dewhurst
Differential Revision: http://reviews.llvm.org/D17074
------------------------------------------------------------------------
Modified:
llvm/branches/release_38/ (props changed)
llvm/branches/release_38/lib/Target/Sparc/SparcInstrAliases.td
llvm/branches/release_38/test/MC/Sparc/sparc-ctrl-instructions.s
llvm/branches/release_38/test/MC/Sparc/sparc64-ctrl-instructions.s
Propchange: llvm/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 16 17:22:17 2016
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,257645,257648,257730,257775,257791,257864,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258103,258112,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259381,259645,259649,259695-259696,259740,259798,259835,259840,259886,259888,259958,260427,260587,260641,260703
+/llvm/trunk:155241,257645,257648,257730,257775,257791,257864,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258103,258112,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259381,259645,259649,259695-259696,259740,259798,259835,259840,259886,259888,259958,260390,260427,260587,260641,260703
Modified: llvm/branches/release_38/lib/Target/Sparc/SparcInstrAliases.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/Sparc/SparcInstrAliases.td?rev=261031&r1=261030&r2=261031&view=diff
==============================================================================
--- llvm/branches/release_38/lib/Target/Sparc/SparcInstrAliases.td (original)
+++ llvm/branches/release_38/lib/Target/Sparc/SparcInstrAliases.td Tue Feb 16 17:22:17 2016
@@ -267,9 +267,9 @@ defm : int_cond_alias<"neg", 0b0110>;
defm : int_cond_alias<"vc", 0b1111>;
defm : int_cond_alias<"vs", 0b0111>;
-defm : fp_cond_alias<"a", 0b0000>;
-defm : fp_cond_alias<"", 0b0000>; // same as a; gnu asm, not in manual
-defm : fp_cond_alias<"n", 0b1000>;
+defm : fp_cond_alias<"a", 0b1000>;
+defm : fp_cond_alias<"", 0b1000>; // same as a; gnu asm, not in manual
+defm : fp_cond_alias<"n", 0b0000>;
defm : fp_cond_alias<"u", 0b0111>;
defm : fp_cond_alias<"g", 0b0110>;
defm : fp_cond_alias<"ug", 0b0101>;
Modified: llvm/branches/release_38/test/MC/Sparc/sparc-ctrl-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/MC/Sparc/sparc-ctrl-instructions.s?rev=261031&r1=261030&r2=261031&view=diff
==============================================================================
--- llvm/branches/release_38/test/MC/Sparc/sparc-ctrl-instructions.s (original)
+++ llvm/branches/release_38/test/MC/Sparc/sparc-ctrl-instructions.s Tue Feb 16 17:22:17 2016
@@ -124,6 +124,18 @@
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
bvs .BB0
+ ! CHECK: fba .BB0 ! encoding: [0x11,0b10AAAAAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
+ fba .BB0
+
+ ! CHECK: fba .BB0 ! encoding: [0x11,0b10AAAAAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
+ fb .BB0
+
+ ! CHECK: fbn .BB0 ! encoding: [0x01,0b10AAAAAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
+ fbn .BB0
+
! CHECK: fbu .BB0 ! encoding: [0x0f,0b10AAAAAA,A,A]
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
fbu .BB0
@@ -131,6 +143,7 @@
! CHECK: fbg .BB0 ! encoding: [0x0d,0b10AAAAAA,A,A]
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
fbg .BB0
+
! CHECK: fbug .BB0 ! encoding: [0x0b,0b10AAAAAA,A,A]
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br22
fbug .BB0
Modified: llvm/branches/release_38/test/MC/Sparc/sparc64-ctrl-instructions.s
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/test/MC/Sparc/sparc64-ctrl-instructions.s?rev=261031&r1=261030&r2=261031&view=diff
==============================================================================
--- llvm/branches/release_38/test/MC/Sparc/sparc64-ctrl-instructions.s (original)
+++ llvm/branches/release_38/test/MC/Sparc/sparc64-ctrl-instructions.s Tue Feb 16 17:22:17 2016
@@ -770,6 +770,18 @@
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
bpos,a,pt %xcc, .BB0
+ ! CHECK: fba %fcc0, .BB0 ! encoding: [0x11,0b01001AAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
+ fba %fcc0, .BB0
+
+ ! CHECK: fba %fcc0, .BB0 ! encoding: [0x11,0b01001AAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
+ fb %fcc0, .BB0
+
+ ! CHECK: fbn %fcc0, .BB0 ! encoding: [0x01,0b01001AAA,A,A]
+ ! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
+ fbn %fcc0, .BB0
+
! CHECK: fbu %fcc0, .BB0 ! encoding: [0x0f,0b01001AAA,A,A]
! CHECK-NEXT: ! fixup A - offset: 0, value: .BB0, kind: fixup_sparc_br19
fbu %fcc0, .BB0
More information about the llvm-branch-commits
mailing list