From 118176876bb5ceef6f8d15413602107c157dd106 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Thu, 3 Sep 2009 16:50:39 +0000 Subject: [PATCH] * config/bfin-parse.y (gen_multi_instr_1): Check anomaly 05000074 only when both slot1 and slot2 are filled. testsuite/ * gas/bfin/parallel5.s: New test. * gas/bfin/error.exp: New test. --- gas/ChangeLog | 5 +++++ gas/config/bfin-parse.y | 1 + gas/testsuite/ChangeLog | 5 +++++ gas/testsuite/gas/bfin/error.exp | 10 ++++++++++ gas/testsuite/gas/bfin/parallel5.s | 4 ++++ 5 files changed, 25 insertions(+) create mode 100644 gas/testsuite/gas/bfin/error.exp create mode 100644 gas/testsuite/gas/bfin/parallel5.s diff --git a/gas/ChangeLog b/gas/ChangeLog index 254a5fb..52031ea 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,5 +1,10 @@ 2009-09-03 Jie Zhang + * config/bfin-parse.y (gen_multi_instr_1): Check anomaly + 05000074 only when both slot1 and slot2 are filled. + +2009-09-03 Jie Zhang + * config/tc-bfin.c (md_assemble): Bump line counters if there is EOL in the instruction. diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y index 952859e..f7228be 100644 --- a/gas/config/bfin-parse.y +++ b/gas/config/bfin-parse.y @@ -391,6 +391,7 @@ gen_multi_instr_1 (INSTR_T dsp32, INSTR_T dsp16_grp1, INSTR_T dsp16_grp2) /* Anomaly 05000074 */ if (ENABLE_AC_05000074 + && dsp32 != NULL && dsp16_grp1 != NULL && (dsp32->value & 0xf780) == 0xc680 && ((dsp16_grp1->value & 0xfe40) == 0x9240 || (dsp16_grp1->value & 0xfe08) == 0xba08 diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 90b5515..1dcde07 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2009-09-03 Jie Zhang + * gas/bfin/parallel5.s: New test. + * gas/bfin/error.exp: New test. + +2009-09-03 Jie Zhang + * gas/bfin/line_number.l, gas/bfin/line_number.s: New test. * gas/bfin/bfin.exp: Add the new test. diff --git a/gas/testsuite/gas/bfin/error.exp b/gas/testsuite/gas/bfin/error.exp new file mode 100644 index 0000000..c602f3d --- /dev/null +++ b/gas/testsuite/gas/bfin/error.exp @@ -0,0 +1,10 @@ +# Test assembler warnings and errors. + +load_lib gas-dg.exp +dg-init + +if [istarget bfin-*-*] { + dg-runtest "$srcdir/$subdir/parallel5.s" "" "" +} + +dg-finish diff --git a/gas/testsuite/gas/bfin/parallel5.s b/gas/testsuite/gas/bfin/parallel5.s new file mode 100644 index 0000000..6156ecb --- /dev/null +++ b/gas/testsuite/gas/bfin/parallel5.s @@ -0,0 +1,4 @@ +# { dg-do assemble { target bfin-*-* } } +# { dg-options "--mcpu=bf537-0.2" } + .section .text; + R0 = W[P1++] (X) || R1.L = W[I1++]; -- 2.7.4