From 84804c5b47636c7fa8bbbd1481ed426f2efc2654 Mon Sep 17 00:00:00 2001 From: Claudiu Zissulescu Date: Mon, 27 Mar 2017 12:56:04 +0200 Subject: [PATCH] [ARC] Save/restore blink when in ISR. gcc/ 2017-03-27 Claudiu Zissulescu * config/arc/arc.c (arc_epilogue_uses): BLINK should be also restored when in interrupt. * config/arc/arc.md (simple_return): ARCv2 rtie instruction doesn't have delay slot. 2017-03-27 Claudiu Zissulescu * testsuite/gcc.target/arc/interrupt-4.c: New file. From-SVN: r246495 --- gcc/ChangeLog | 7 +++++++ gcc/config/arc/arc.c | 10 ++++++---- gcc/config/arc/arc.md | 7 ++++++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.target/arc/interrupt-4.c | 15 +++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.target/arc/interrupt-4.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2997a003f82..336fa7fedf1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-03-27 Claudiu Zissulescu + + * config/arc/arc.c (arc_epilogue_uses): BLINK should be also + restored when in interrupt. + * config/arc/arc.md (simple_return): ARCv2 rtie instruction + doesn't have delay slot. + 2017-03-27 Richard Biener PR ipa/79776 diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c index 1116b2dbc25..0563a74b724 100644 --- a/gcc/config/arc/arc.c +++ b/gcc/config/arc/arc.c @@ -9381,9 +9381,10 @@ arc_can_follow_jump (const rtx_insn *follower, const rtx_insn *followee) Return true if REGNO should be added to the deemed uses of the epilogue. We use the return address - arc_return_address_regs[arc_compute_function_type (cfun)] . - But also, we have to make sure all the register restore instructions - are known to be live in interrupt functions. */ + arc_return_address_regs[arc_compute_function_type (cfun)]. But + also, we have to make sure all the register restore instructions + are known to be live in interrupt functions, plus the blink + register if it is clobbered by the isr. */ bool arc_epilogue_uses (int regno) @@ -9396,7 +9397,8 @@ arc_epilogue_uses (int regno) { if (!fixed_regs[regno]) return true; - return regno == arc_return_address_regs[cfun->machine->fn_type]; + return ((regno == arc_return_address_regs[cfun->machine->fn_type]) + || (regno == RETURN_ADDR_REGNUM)); } else return regno == RETURN_ADDR_REGNUM; diff --git a/gcc/config/arc/arc.md b/gcc/config/arc/arc.md index a65735f8a7d..88b7fca8c08 100644 --- a/gcc/config/arc/arc.md +++ b/gcc/config/arc/arc.md @@ -4748,7 +4748,12 @@ output_asm_insn (\"j%!%* [%0]%&\", ®); return \"\"; } - [(set_attr "type" "return") + [(set (attr "type") + (cond [(and (eq (symbol_ref "arc_compute_function_type (cfun)") + (symbol_ref "ARC_FUNCTION_ILINK1")) + (match_test "TARGET_V2")) + (const_string "brcc_no_delay_slot")] + (const_string "return"))) ; predicable won't help here since the canonical rtl looks different ; for branches. (set (attr "cond") diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 169a2ca5b5d..184ccdb4712 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-03-27 Claudiu Zissulescu + + * testsuite/gcc.target/arc/interrupt-4.c: New file. + 2017-03-27 Richard Biener PR ipa/79776 diff --git a/gcc/testsuite/gcc.target/arc/interrupt-4.c b/gcc/testsuite/gcc.target/arc/interrupt-4.c new file mode 100644 index 00000000000..ea6596eb128 --- /dev/null +++ b/gcc/testsuite/gcc.target/arc/interrupt-4.c @@ -0,0 +1,15 @@ +#if defined (__ARCHS__) || defined (__ARCEM__) +#define RILINK "ilink" +#else +#define RILINK "ilink1" +#endif + +extern int gpio_int; +extern int read_reg (int); + +void __attribute__ ((interrupt(RILINK))) +isr_handler (void) +{ + gpio_int = read_reg (1); +} +/* { dg-final { scan-assembler-times "blink" 2 } } */ -- 2.30.2