maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add support for -mstrict-align compiler option for ARM targets. 

rdar://12340498

llvm-svn: 167620
This commit is contained in:
Chad Rosier 2012-11-09 17:29:38 +00:00
parent 6002702b06
commit 332fc75b2c
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/include/llvm/Target/TargetOptions.h
View File

@ -48,10 +48,10 @@ namespace llvm {
UseSoftFloat(false), NoZerosInBSS(false), JITExceptionHandling(false), UseSoftFloat(false), NoZerosInBSS(false), JITExceptionHandling(false),
JITEmitDebugInfo(false), JITEmitDebugInfoToDisk(false), JITEmitDebugInfo(false), JITEmitDebugInfoToDisk(false),
GuaranteedTailCallOpt(false), DisableTailCalls(false), GuaranteedTailCallOpt(false), DisableTailCalls(false),
StackAlignmentOverride(0), RealignStack(true), EnableFastISel(false), StackAlignmentOverride(0), RealignStack(true), StrictAlign(false),
PositionIndependentExecutable(false), EnableSegmentedStacks(false), EnableFastISel(false), PositionIndependentExecutable(false),
UseInitArray(false), TrapFuncName(""), FloatABIType(FloatABI::Default), EnableSegmentedStacks(false), UseInitArray(false), TrapFuncName(""),
AllowFPOpFusion(FPOpFusion::Standard) FloatABIType(FloatABI::Default), AllowFPOpFusion(FPOpFusion::Standard)
{} {}
/// PrintMachineCode - This flag is enabled when the -print-machineinstrs /// PrintMachineCode - This flag is enabled when the -print-machineinstrs
@ -155,6 +155,10 @@ namespace llvm {
/// automatically realigned, if needed. /// automatically realigned, if needed.
unsigned RealignStack : 1; unsigned RealignStack : 1;
/// StrictAlign - This flag indicates that all memory accesses must be
/// aligned. (ARM only)
unsigned StrictAlign : 1;
/// SSPBufferSize - The minimum size of buffers that will receive stack /// SSPBufferSize - The minimum size of buffers that will receive stack
/// smashing protection when -fstack-protection is used. /// smashing protection when -fstack-protection is used.
unsigned SSPBufferSize; unsigned SSPBufferSize;

12
llvm/lib/Target/ARM/ARMFastISel.cpp
View File

@ -1028,7 +1028,8 @@ bool ARMFastISel::ARMEmitLoad(EVT VT, unsigned &ResultReg, Address &Addr,
RC = &ARM::GPRRegClass; RC = &ARM::GPRRegClass;
break; break;
case MVT::i16: case MVT::i16:
if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem()) if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
TM.Options.StrictAlign))
return false; return false;
if (isThumb2) { if (isThumb2) {
@ -1043,7 +1044,8 @@ bool ARMFastISel::ARMEmitLoad(EVT VT, unsigned &ResultReg, Address &Addr,
RC = &ARM::GPRRegClass; RC = &ARM::GPRRegClass;
break; break;
case MVT::i32: case MVT::i32:
if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem()) if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
TM.Options.StrictAlign))
return false; return false;
if (isThumb2) { if (isThumb2) {
@ -1152,7 +1154,8 @@ bool ARMFastISel::ARMEmitStore(EVT VT, unsigned SrcReg, Address &Addr,
} }
break; break;
case MVT::i16: case MVT::i16:
if (Alignment && Alignment < 2 && !Subtarget->allowsUnalignedMem()) if (Alignment && Alignment < 2 && (!Subtarget->allowsUnalignedMem() ||
TM.Options.StrictAlign))
return false; return false;
if (isThumb2) { if (isThumb2) {
@ -1166,7 +1169,8 @@ bool ARMFastISel::ARMEmitStore(EVT VT, unsigned SrcReg, Address &Addr,
} }
break; break;
case MVT::i32: case MVT::i32:
if (Alignment && Alignment < 4 && !Subtarget->allowsUnalignedMem()) if (Alignment && Alignment < 4 && (!Subtarget->allowsUnalignedMem() ||
TM.Options.StrictAlign))
return false; return false;
if (isThumb2) { if (isThumb2) {

3
llvm/lib/Target/ARM/ARMISelLowering.cpp
View File

@ -9119,7 +9119,8 @@ bool ARMTargetLowering::isDesirableToTransformToIntegerOp(unsigned Opc,
bool ARMTargetLowering::allowsUnalignedMemoryAccesses(EVT VT) const { bool ARMTargetLowering::allowsUnalignedMemoryAccesses(EVT VT) const {
// The AllowsUnaliged flag models the SCTLR.A setting in ARM cpus // The AllowsUnaliged flag models the SCTLR.A setting in ARM cpus
bool AllowsUnaligned = Subtarget->allowsUnalignedMem(); bool AllowsUnaligned = Subtarget->allowsUnalignedMem() &&
!getTargetMachine().Options.StrictAlign;
switch (VT.getSimpleVT().SimpleTy) { switch (VT.getSimpleVT().SimpleTy) {
default: default: