From 971c3d0ea28fda1e764c6f47e0d901418adddb93 Mon Sep 17 00:00:00 2001 From: Nagaraju Mekala Date: Sat, 4 Apr 2020 14:19:55 +0530 Subject: [PATCH] Microblaze: Modified trap instruction There is a bug in trap instruction generation. Instead of "bri 0" instruction "brki r0, -1" was used, corrected it now. * gcc/config/microblaze/microblaze.md (trap): Update output pattern. * gcc.target/microblaze/others/builtin-trap.c: Update expected output. --- gcc/ChangeLog | 7 +++++++ gcc/config/microblaze/microblaze.md | 2 +- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9501c946cbd..220255a3bc8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2020-04-05 Nagaraju Mekala + + * gcc/config/microblaze/microblaze.md (trap): Update output pattern. + + * gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c + (dg-final): update in the scan-assembler instruction + 2020-04-04 Hannes Domani Jakub Jelinek diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md index 1970cc67f8f..7049acd1dcd 100644 --- a/gcc/config/microblaze/microblaze.md +++ b/gcc/config/microblaze/microblaze.md @@ -2303,7 +2303,7 @@ (define_insn "trap" [(trap_if (const_int 1) (const_int 0))] "" - "brki\tr0,-1" + "bri\t0" [(set_attr "type" "trap")] ) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 058af2c3704..7d90855df0c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-04-05 Nagaraju Mekala + + * gcc.target/microblaze/others/builtin-trap.c: Update expected output. + 2020-04-04 Hannes Domani Jakub Jelinek diff --git a/gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c b/gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c index fdcde1fa7de..580b4db4e5b 100644 --- a/gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c +++ b/gcc/testsuite/gcc.target/microblaze/others/builtin-trap.c @@ -5,4 +5,4 @@ void trap () __builtin_trap (); } -/* { dg-final { scan-assembler "brki\tr0,-1" } } */ \ No newline at end of file +/* { dg-final { scan-assembler "bri\t0" } } */ -- 2.30.2