6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 21:32:10 +00:00
Code Issues Projects Releases Wiki Activity

Take care of long short branch immediate instructions for mips16 in

Browse Source 
constant islands.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194630 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reed Kotler 2013-11-13 23:52:18 +00:00
parent a2b4eb6d15
commit 5aeb5e530e
3 changed files with 69 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Target/Mips/MipsConstantIslandPass.cpp
View File

@ -417,13 +417,11 @@ bool MipsConstantIslands::runOnMachineFunction(MachineFunction &mf) {
DEBUG(dbgs() << "Beginning BR iteration #" << NoBRIters << '\n');
bool BRChange = false;
#ifdef IN_PROGRESS
for (unsigned i = 0, e = ImmBranches.size(); i != e; ++i)
BRChange |= fixupImmediateBr(ImmBranches[i]);
if (BRChange && ++NoBRIters > 30)
report_fatal_error("Branch Fix Up pass failed to converge!");
DEBUG(dumpBBs());
#endif
if (!CPChange && !BRChange)
break;
MadeChange = true;
@ -588,7 +586,6 @@ initializeFunctionInfo(const std::vector<MachineInstr*> &CPEMIs) {
continue;
int Opc = I->getOpcode();
#ifdef IN_PROGRESS
if (I->isBranch()) {
bool isCond = false;
unsigned Bits = 0;
@ -596,13 +593,21 @@ initializeFunctionInfo(const std::vector<MachineInstr*> &CPEMIs) {
int UOpc = Opc;
switch (Opc) {
default:
continue; // Ignore other JT branches
continue; // Ignore other branches for now
case Mips::Bimm16:
Bits = 11;
Scale = 2;
isCond = false;
break;
case Mips::BimmX16:
Bits = 16;
Scale = 2;
isCond = false;
}
// Record this immediate branch.
unsigned MaxOffs = ((1 << (Bits-1))-1) * Scale;
ImmBranches.push_back(ImmBranch(I, MaxOffs, isCond, UOpc));
}
#endif
if (Opc == Mips::CONSTPOOL_ENTRY)
continue;

33
test/CodeGen/Mips/brsize3.ll Normal file
View File

@ -0,0 +1,33 @@
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-no-short
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-long
; ModuleID = 'brsize3.c'
target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64"
target triple = "mips--linux-gnu"
; Function Attrs: noreturn nounwind optsize
define void @foo() #0 {
entry:
br label %x
x: ; preds = %x, %entry
tail call void asm sideeffect ".space 60000", ""() #1, !srcloc !1
br label %x
; b-long: $BB0_1:
; b-long: #APP
; b-long: .space 60000
; b-long: #NO_APP
; b-long: b $BB0_1
; b-no-short: $BB0_1:
; b-no-short: #APP
; b-no-short: .space 60000
; b-no-short: #NO_APP
; b-no-short-NOT: b $BB0_1 # 16 bit inst
}
attributes #0 = { noreturn nounwind optsize "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="true" }
attributes #1 = { nounwind }
!1 = metadata !{i32 45}

26
test/CodeGen/Mips/brsize3a.ll Normal file
View File

@ -0,0 +1,26 @@
; RUN: llc -mtriple=mipsel-linux-gnu -march=mipsel -mcpu=mips16 -soft-float -mips16-hard-float -relocation-model=pic -mips16-constant-islands < %s | FileCheck %s -check-prefix=b-short
; ModuleID = 'brsize3.c'
target datalayout = "E-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32-S64"
target triple = "mips--linux-gnu"
; Function Attrs: noreturn nounwind optsize
define void @foo() #0 {
entry:
br label %x
x: ; preds = %x, %entry
tail call void asm sideeffect ".space 200", ""() #1, !srcloc !1
br label %x
; b-short: $BB0_1:
; b-short: #APP
; b-short: .space 200
; b-short: #NO_APP
; b-short: b $BB0_1 # 16 bit inst
}
attributes #0 = { noreturn nounwind optsize "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="true" }
attributes #1 = { nounwind }
!1 = metadata !{i32 45}