Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions llvm/lib/Target/AVR/AVRExpandPseudoInsts.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2547,25 +2547,28 @@ bool AVRExpandPseudo::expand<AVR::SPWRITE>(Block &MBB, BlockIt MBBI) {
.addReg(SrcHiReg, getKillRegState(SrcIsKill))
.setMIFlags(Flags);

} else { // Disable interrupts for older devices (3 extra instructions)
} else { // Disable interrupts for older devices with SPH (3 extra
// instructions)

buildMI(MBB, MBBI, AVR::INRdA)
.addReg(STI.getTmpRegister(), RegState::Define)
.addImm(STI.getIORegSREG())
.setMIFlags(Flags);
if (STI.getIORegSPH() != -1) {

buildMI(MBB, MBBI, AVR::INRdA)
.addReg(STI.getTmpRegister(), RegState::Define)
.addImm(STI.getIORegSREG())
.setMIFlags(Flags);

buildMI(MBB, MBBI, AVR::BCLRs).addImm(0x07).setMIFlags(Flags);
buildMI(MBB, MBBI, AVR::BCLRs).addImm(0x07).setMIFlags(Flags);

if (STI.getIORegSPH() != -1)
buildMI(MBB, MBBI, AVR::OUTARr)
.addImm(STI.getIORegSPH())
.addReg(SrcHiReg, getKillRegState(SrcIsKill))
.setMIFlags(Flags);

buildMI(MBB, MBBI, AVR::OUTARr)
.addImm(STI.getIORegSREG())
.addReg(STI.getTmpRegister(), RegState::Kill)
.setMIFlags(Flags);
buildMI(MBB, MBBI, AVR::OUTARr)
.addImm(STI.getIORegSREG())
.addReg(STI.getTmpRegister(), RegState::Kill)
.setMIFlags(Flags);
}

buildMI(MBB, MBBI, AVR::OUTARr)
.addImm(STI.getIORegSPL())
Expand Down
5 changes: 1 addition & 4 deletions llvm/test/CodeGen/AVR/pseudo/SPWRITE.mir
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# RUN: llc -O0 -run-pass=avr-expand-pseudo -mtriple=avr -mcpu=attiny11 %s -o - \
# RUN: llc -O0 -run-pass=avr-expand-pseudo -mtriple=avr -mcpu=attiny13 %s -o - \
# RUN: | FileCheck --check-prefix=NOSPH %s
# RUN: llc -O0 -run-pass=avr-expand-pseudo -mtriple=avr -mcpu=atmega328 %s -o - \
# RUN: | FileCheck %s
Expand Down Expand Up @@ -34,9 +34,6 @@ body: |
; CHECK: OUTARr 61, $r14

; NOSPH-LABEL: test
; NOSPH: $r0 = INRdA 63
; NOSPH: BCLRs 7, implicit-def $sreg
; NOSPH: OUTARr 63, killed $r0
; NOSPH: OUTARr 61, $r14

; XMEGA-LABEL: test
Expand Down