Fix JIT encoding of conditional branches

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

1 files changed, 7 insertions, 15 deletions

diff --git a/lib/Target/PowerPC/PPCInstrFormats.td b/lib/Target/PowerPC/PPCInstrFormats.td
index a52bda249a..dfbbbe49e7 100644
--- a/lib/Target/PowerPC/PPCInstrFormats.td
+++ b/lib/Target/PowerPC/PPCInstrFormats.td
@@ -66,28 +66,20 @@ class IForm<bits<6> opcode, bit aa, bit lk, dag OL, string asmstr>
 }
 
 // 1.7.2 B-Form
-class BForm<bits<6> opcode, bit aa, bit lk, dag OL, string asmstr>
-         : I<opcode, OL, asmstr> {
-  bits<5>  BO;
-  bits<3>  CRNum;
-  bits<2>  BICode;
+class BForm<bits<6> opcode, bit aa, bit lk, bits<5> bo, bits<2> bicode, dag OL, 
+            string asmstr>
+  : I<opcode, OL, asmstr> {
+  bits<3>  CR;
   bits<14> BD;
 
-  let Inst{6-10}  = BO;
-  let Inst{11-13} = CRNum;
-  let Inst{14-15} = BICode;
+  let Inst{6-10}  = bo;
+  let Inst{11-13} = CR;
+  let Inst{14-15} = bicode;
   let Inst{16-29} = BD;
   let Inst{30}    = aa;
   let Inst{31}    = lk;
 }
 
-class BForm_ext<bits<6> opcode, bit aa, bit lk, bits<5> bo, bits<2> bicode, 
-                dag OL, string asmstr>
-  : BForm<opcode, aa, lk, OL, asmstr> {
-  let BO = bo;
-  let BICode = bicode;
-}
-
 // 1.7.4 D-Form
 class DForm_base<bits<6> opcode, dag OL, string asmstr> : I<opcode, OL, asmstr>{
   bits<5>  A;