Skip to content

Commit

Permalink
opcodes: blackfin: fix decoding of dsp mult insns
Browse files Browse the repository at this point in the history 
When assigning to a register half, the mac0 part of the mult insn
was not decoding properly.  It would always show a full dreg instead
of the dreg low half.

Once we fix the disassembler, we have to update a few of the gas
tests as their previous expected output was incorrect.

Signed-off-by: Mike Frysinger <[email protected]>
  • Loading branch information
@vapier
vapier committed Feb 13, 2011
1 parent 36f4461 commit 4db6639
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 25 deletions.
7 changes: 6 additions & 1 deletion gas/testsuite/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
2011-02-12 Mike Frysinger <[email protected]>
2011-02-13 Mike Frysinger <[email protected]>

* gas/bfin/arithmetic.d, gas/bfin/parallel.d, gas/bfin/parallel3.d,
gas/bfin/vector.d, gas/bfin/vector2.d: Add ".L" to dsp mult insns.

2011-02-13 Mike Frysinger <[email protected]>

* gas/bfin/video.d, gas/bfin/video.s, gas/bfin/video2.d,
gas/bfin/video2.s: Remove BYTEOP2M insns.
Expand Down
6 changes: 3 additions & 3 deletions gas/testsuite/gas/bfin/arithmetic.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ Disassembly of section .text:
a8: 2b c4 [0-3][[:xdigit:]] 40 R0.H = \(A0 \+= A1\);

000000ac <multiply16>:
ac: 00 c2 0a 24 R0 = R1.H \* R2.L;
b0: 20 c2 68 26 R1 = R5.H \* R0.H \(S2RND\);
b4: 80 c2 db 23 R7 = R3.L \* R3.H \(FU\);
ac: 00 c2 0a 24 R0.L = R1.H \* R2.L;
b0: 20 c2 68 26 R1.L = R5.H \* R0.H \(S2RND\);
b4: 80 c2 db 23 R7.L = R3.L \* R3.H \(FU\);
b8: 28 c3 15 27 R4 = R2.H \* R5.H \(ISS2\);
bc: 08 c3 0b 20 R0 = R1.L \* R3.L \(IS\);
c0: 08 c2 a8 25 R6 = R5.H \* R0.L;
Expand Down
6 changes: 3 additions & 3 deletions gas/testsuite/gas/bfin/parallel.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ Disassembly of section .text:
144: 3b 9b 0f 9c
148: 2b cc 00 40 R0.H = \(A0 \+= A1\) \|\| B\[P0\] = R3 \|\| R7 = \[I0\+\+\];
14c: 03 9b 07 9c
150: 00 ca 0a 24 R0 = R1.H \* R2.L \|\| B\[P1\] = R3 \|\| R1 = \[I0\+\+\];
150: 00 ca 0a 24 R0.L = R1.H \* R2.L \|\| B\[P1\] = R3 \|\| R1 = \[I0\+\+\];
154: 0b 9b 01 9c
158: 20 ca 68 26 R1 = R5.H \* R0.H \(S2RND\) \|\| B\[P2\] = R3 \|\| R2 = \[I0\+\+\];
158: 20 ca 68 26 R1.L = R5.H \* R0.H \(S2RND\) \|\| B\[P2\] = R3 \|\| R2 = \[I0\+\+\];
15c: 13 9b 02 9c
160: 80 ca db 23 R7 = R3.L \* R3.H \(FU\) \|\| B\[P3\] = R3 \|\| R3 = \[I0\+\+\];
160: 80 ca db 23 R7.L = R3.L \* R3.H \(FU\) \|\| B\[P3\] = R3 \|\| R3 = \[I0\+\+\];
164: 1b 9b 03 9c
168: 28 cb 15 27 R4 = R2.H \* R5.H \(ISS2\) \|\| B\[P4\] = R3 \|\| R0 = \[I0\+\+\];
16c: 23 9b 00 9c
Expand Down
12 changes: 6 additions & 6 deletions gas/testsuite/gas/bfin/parallel3.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,21 +73,21 @@ Disassembly of section .text:
104: 68 92 00 00
108: 06 cc 17 40 R0 = MIN \(R2, R7\) \(V\) \|\| \[P5--\] = P0 \|\| NOP;
10c: e8 92 00 00
110: 04 ca be 66 R2.H = R7.L \* R6.H, R2 = R7.H \* R6.H \|\| \[P5 \+ 0x8\] = P0 \|\| NOP;
110: 04 ca be 66 R2.H = R7.L \* R6.H, R2.L = R7.H \* R6.H \|\| \[P5 \+ 0x8\] = P0 \|\| NOP;
114: a8 bc 00 00
118: 04 ca 08 e1 R4.H = R1.H \* R0.H, R4 = R1.L \* R0.L \|\| \[P5 \+ 0x4\] = P0 \|\| NOP;
118: 04 ca 08 e1 R4.H = R1.H \* R0.H, R4.L = R1.L \* R0.L \|\| \[P5 \+ 0x4\] = P0 \|\| NOP;
11c: 68 bc 00 00
120: 04 ca 1a a0 R0.H = R3.H \* R2.L, R0 = R3.L \* R2.L \|\| \[P5\] = P0 \|\| NOP;
120: 04 ca 1a a0 R0.H = R3.H \* R2.L, R0.L = R3.L \* R2.L \|\| \[P5\] = P0 \|\| NOP;
124: 68 93 00 00
128: 94 ca 5a e1 R5.H = R3.H \* R2.H \(M\), R5 = R3.L \* R2.L \(FU\) \|\| \[SP\] = P0 \|\| NOP;
128: 94 ca 5a e1 R5.H = R3.H \* R2.H \(M\), R5.L = R3.L \* R2.L \(FU\) \|\| \[SP\] = P0 \|\| NOP;
12c: 70 93 00 00
130: 2c ca 27 e0 R1 = R4.H \* R7.H, R0 = R4.L \* R7.L \(S2RND\) \|\| \[SP\+\+\] = P0 \|\| NOP;
134: 70 92 00 00
138: 0c ca 95 27 R7 = R2.L \* R5.L, R6 = R2.H \* R5.H \|\| \[SP--\] = P0 \|\| NOP;
13c: f0 92 00 00
140: 24 cb 3e e0 R0.H = R7.H \* R6.H, R0 = R7.L \* R6.L \(ISS2\) \|\| \[SP \+ 0x3c\] = P0 \|\| NOP;
140: 24 cb 3e e0 R0.H = R7.H \* R6.H, R0.L = R7.L \* R6.L \(ISS2\) \|\| \[SP \+ 0x3c\] = P0 \|\| NOP;
144: f0 bf 00 00
148: 04 cb c1 e0 R3.H = R0.H \* R1.H, R3 = R0.L \* R1.L \(IS\) \|\| \[FP\] = P0 \|\| NOP;
148: 04 cb c1 e0 R3.H = R0.H \* R1.H, R3.L = R0.L \* R1.L \(IS\) \|\| \[FP\] = P0 \|\| NOP;
14c: 78 93 00 00
150: 00 c8 13 46 A1 = R2.L \* R3.H, A0 = R2.H \* R3.H \|\| \[FP\+\+\] = P0 \|\| NOP;
154: 78 92 00 00
Expand Down
12 changes: 6 additions & 6 deletions gas/testsuite/gas/bfin/vector.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ Disassembly of section .text:
84: 06 c4 17 40 R0 = MIN \(R2, R7\) \(V\);

00000088 <vector_mul>:
88: 04 c2 be 66 R2.H = R7.L \* R6.H, R2 = R7.H \* R6.H;
8c: 04 c2 08 e1 R4.H = R1.H \* R0.H, R4 = R1.L \* R0.L;
90: 04 c2 1a a0 R0.H = R3.H \* R2.L, R0 = R3.L \* R2.L;
94: 94 c2 5a e1 R5.H = R3.H \* R2.H \(M\), R5 = R3.L \* R2.L \(FU\);
88: 04 c2 be 66 R2.H = R7.L \* R6.H, R2.L = R7.H \* R6.H;
8c: 04 c2 08 e1 R4.H = R1.H \* R0.H, R4.L = R1.L \* R0.L;
90: 04 c2 1a a0 R0.H = R3.H \* R2.L, R0.L = R3.L \* R2.L;
94: 94 c2 5a e1 R5.H = R3.H \* R2.H \(M\), R5.L = R3.L \* R2.L \(FU\);
98: 2c c2 27 e0 R1 = R4.H \* R7.H, R0 = R4.L \* R7.L \(S2RND\);
9c: 0c c2 95 27 R7 = R2.L \* R5.L, R6 = R2.H \* R5.H;
a0: 24 c3 3e e0 R0.H = R7.H \* R6.H, R0 = R7.L \* R6.L \(ISS2\);
a4: 04 c3 c1 e0 R3.H = R0.H \* R1.H, R3 = R0.L \* R1.L \(IS\);
a0: 24 c3 3e e0 R0.H = R7.H \* R6.H, R0.L = R7.L \* R6.L \(ISS2\);
a4: 04 c3 c1 e0 R3.H = R0.H \* R1.H, R3.L = R0.L \* R1.L \(IS\);
a8: 00 c0 13 46 A1 = R2.L \* R3.H, A0 = R2.H \* R3.H;
ac: 01 c0 08 c0 A1 \+= R1.H \* R0.H, A0 = R1.L \* R0.L;
b0: 60 c0 2f c8 A1 = R5.H \* R7.H, A0 \+= R5.L \* R7.L \(W32\);
Expand Down
8 changes: 4 additions & 4 deletions gas/testsuite/gas/bfin/vector2.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ Disassembly of section .text:
64c: 06 c4 01 4e R7 = MIN \(R0, R1\) \(V\);
650: 06 c4 1c 44 R2 = MIN \(R3, R4\) \(V\);
654: 06 c4 37 4a R5 = MIN \(R6, R7\) \(V\);
658: 04 c2 be 66 R2.H = R7.L \* R6.H, R2 = R7.H \* R6.H;
65c: 04 c2 08 e1 R4.H = R1.H \* R0.H, R4 = R1.L \* R0.L;
660: 14 c2 1a a0 R0.H = R3.H \* R2.L \(M\), R0 = R3.L \* R2.L;
658: 04 c2 be 66 R2.H = R7.L \* R6.H, R2.L = R7.H \* R6.H;
65c: 04 c2 08 e1 R4.H = R1.H \* R0.H, R4.L = R1.L \* R0.L;
660: 14 c2 1a a0 R0.H = R3.H \* R2.L \(M\), R0.L = R3.L \* R2.L;
664: 00 c0 13 46 A1 = R2.L \* R3.H, A0 = R2.H \* R3.H;
668: 01 c0 08 c0 A1 \+= R1.H \* R0.H, A0 = R1.L \* R0.L;
66c: 01 c0 1b 96 A1 \+= R3.H \* R3.L, A0 -= R3.H \* R3.H;
Expand Down Expand Up @@ -469,7 +469,7 @@ Disassembly of section .text:
734: 00 9e 32 9c
738: 8b c8 9a 2f R6 = \(A0 \+= R3.H \* R2.H\) \(FU\) \|\| I2 -= M0 \|\| NOP;
73c: 72 9e 00 00
740: 14 c2 1a a0 R0.H = R3.H \* R2.L \(M\), R0 = R3.L \* R2.L;
740: 14 c2 1a a0 R0.H = R3.H \* R2.L \(M\), R0.L = R3.L \* R2.L;
744: 1c c2 b8 60 R3 = R7.L \* R0.H \(M\), R2 = R7.L \* R0.L;
748: 1c c0 b8 60 R3 = \(A1 = R7.L \* R0.H\) \(M\), R2 = \(A0 = R7.L \* R0.L\);
74c: 44 c0 23 04 R0.H = \(A1 = R4.L \* R3.L\), A0 = R4.H \* R3.L \(T\);
Expand Down
5 changes: 5 additions & 0 deletions opcodes/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2011-02-13 Mike Frysinger <[email protected]>

* bfin-dis.c (decode_dsp32mult_0): Add 1 to dst for mac1. Output
dregs only when P is set, and dregs_lo otherwise.

2011-02-13 Mike Frysinger <[email protected]>

* bfin-dis.c (decode_dsp32alu_0): Delete BYTEOP2M code.
Expand Down
4 changes: 2 additions & 2 deletions opcodes/bfin-dis.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3084,7 +3084,7 @@ decode_dsp32mult_0 (TIword iw0, TIword iw1, disassemble_info *outf)

if (w1)
{
OUTS (outf, P ? dregs (dst | 1) : dregs_hi (dst));
OUTS (outf, P ? dregs (dst + 1) : dregs_hi (dst));
OUTS (outf, " = ");
decode_multfunc (h01, h11, src0, src1, outf);

Expand All @@ -3099,7 +3099,7 @@ decode_dsp32mult_0 (TIword iw0, TIword iw1, disassemble_info *outf)

if (w0)
{
OUTS (outf, dregs (dst));
OUTS (outf, P ? dregs (dst) : dregs_lo (dst));
OUTS (outf, " = ");
decode_multfunc (h00, h10, src0, src1, outf);
}
Expand Down

0 comments on commit 4db6639

Please sign in to comment.