1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 19:52:54 +01:00

Fix some load/store logic that would be wrong for

apints on big-endian machines if the bitwidth is
not a multiple of 8.  Introduce a new helper,
MVT::getStoreSizeInBits, and use it.

llvm-svn: 43934
This commit is contained in:
Duncan Sands 2007-11-09 08:57:19 +00:00
parent 3a9cf68f35
commit 7df7c7aed1
3 changed files with 17 additions and 6 deletions

View File

@ -243,6 +243,13 @@ namespace MVT { // MVT = Machine Value Types
} }
} }
/// MVT::getStoreSizeInBits - Return the number of bits overwritten by a
/// store of the specified value type.
///
static inline unsigned getStoreSizeInBits(ValueType VT) {
return (getSizeInBits(VT) + 7)/8*8;
}
/// MVT::getIntegerType - Returns the ValueType that represents an integer /// MVT::getIntegerType - Returns the ValueType that represents an integer
/// with the given number of bits. /// with the given number of bits.
/// ///

View File

@ -1713,8 +1713,9 @@ SDOperand DAGCombiner::visitAND(SDNode *N) {
// For big endian targets, we need to add an offset to the pointer to // For big endian targets, we need to add an offset to the pointer to
// load the correct bytes. For little endian systems, we merely need to // load the correct bytes. For little endian systems, we merely need to
// read fewer bytes from the same pointer. // read fewer bytes from the same pointer.
unsigned PtrOff = unsigned LVTStoreBytes = MVT::getStoreSizeInBits(LoadedVT)/8;
(MVT::getSizeInBits(LoadedVT) - MVT::getSizeInBits(EVT)) / 8; unsigned EVTStoreBytes = MVT::getStoreSizeInBits(EVT)/8;
unsigned PtrOff = LVTStoreBytes - EVTStoreBytes;
unsigned Alignment = LN0->getAlignment(); unsigned Alignment = LN0->getAlignment();
SDOperand NewPtr = LN0->getBasePtr(); SDOperand NewPtr = LN0->getBasePtr();
if (!TLI.isLittleEndian()) { if (!TLI.isLittleEndian()) {
@ -2991,8 +2992,11 @@ SDOperand DAGCombiner::ReduceLoadWidth(SDNode *N) {
MVT::ValueType PtrType = N0.getOperand(1).getValueType(); MVT::ValueType PtrType = N0.getOperand(1).getValueType();
// For big endian targets, we need to adjust the offset to the pointer to // For big endian targets, we need to adjust the offset to the pointer to
// load the correct bytes. // load the correct bytes.
if (!TLI.isLittleEndian()) if (!TLI.isLittleEndian()) {
ShAmt = MVT::getSizeInBits(N0.getValueType()) - ShAmt - EVTBits; unsigned LVTStoreBits = MVT::getStoreSizeInBits(N0.getValueType());
unsigned EVTStoreBits = MVT::getStoreSizeInBits(EVT);
ShAmt = LVTStoreBits - EVTStoreBits - ShAmt;
}
uint64_t PtrOff = ShAmt / 8; uint64_t PtrOff = ShAmt / 8;
unsigned NewAlign = MinAlign(LN0->getAlignment(), PtrOff); unsigned NewAlign = MinAlign(LN0->getAlignment(), PtrOff);
SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(), SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(),

View File

@ -1036,7 +1036,7 @@ void DAGTypeLegalizer::ExpandResult_LOAD(LoadSDNode *N,
// Big-endian - high bits are at low addresses. Favor aligned loads at // Big-endian - high bits are at low addresses. Favor aligned loads at
// the cost of some bit-fiddling. // the cost of some bit-fiddling.
MVT::ValueType EVT = N->getLoadedVT(); MVT::ValueType EVT = N->getLoadedVT();
unsigned EBytes = (MVT::getSizeInBits(EVT) + 7)/8; unsigned EBytes = MVT::getStoreSizeInBits(EVT)/8;
unsigned IncrementSize = MVT::getSizeInBits(NVT)/8; unsigned IncrementSize = MVT::getSizeInBits(NVT)/8;
unsigned ExcessBits = (EBytes - IncrementSize)*8; unsigned ExcessBits = (EBytes - IncrementSize)*8;
@ -2069,7 +2069,7 @@ SDOperand DAGTypeLegalizer::ExpandOperand_STORE(StoreSDNode *N, unsigned OpNo) {
GetExpandedOp(N->getValue(), Lo, Hi); GetExpandedOp(N->getValue(), Lo, Hi);
MVT::ValueType EVT = N->getStoredVT(); MVT::ValueType EVT = N->getStoredVT();
unsigned EBytes = (MVT::getSizeInBits(EVT) + 7)/8; unsigned EBytes = MVT::getStoreSizeInBits(EVT)/8;
unsigned IncrementSize = MVT::getSizeInBits(NVT)/8; unsigned IncrementSize = MVT::getSizeInBits(NVT)/8;
unsigned ExcessBits = (EBytes - IncrementSize)*8; unsigned ExcessBits = (EBytes - IncrementSize)*8;
MVT::ValueType HiVT = MVT::ValueType HiVT =