mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-17 21:35:07 +00:00
Dumb bug. Code sees a memcpy from X+c so it increments src offset. But it
turns out not to point to a constant string but it forgot change the offset back. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26242 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
fe5cb19405
commit
cffbb5174f
@ -1658,9 +1658,10 @@ void SelectionDAGLowering::visitMemIntrinsic(CallInst &I, unsigned Op) {
|
|||||||
if (MeetsMaxMemopRequirement(MemOps, TLI.getMaxStoresPerMemcpy(),
|
if (MeetsMaxMemopRequirement(MemOps, TLI.getMaxStoresPerMemcpy(),
|
||||||
Size->getValue(), Align, TLI)) {
|
Size->getValue(), Align, TLI)) {
|
||||||
unsigned NumMemOps = MemOps.size();
|
unsigned NumMemOps = MemOps.size();
|
||||||
unsigned SrcOff = 0, DstOff = 0;
|
unsigned SrcOff = 0, DstOff = 0, SrcDelta = 0;
|
||||||
GlobalAddressSDNode *G = NULL;
|
GlobalAddressSDNode *G = NULL;
|
||||||
std::string Str;
|
std::string Str;
|
||||||
|
bool CopyFromStr = false;
|
||||||
|
|
||||||
if (Op2.getOpcode() == ISD::GlobalAddress)
|
if (Op2.getOpcode() == ISD::GlobalAddress)
|
||||||
G = cast<GlobalAddressSDNode>(Op2);
|
G = cast<GlobalAddressSDNode>(Op2);
|
||||||
@ -1668,12 +1669,17 @@ void SelectionDAGLowering::visitMemIntrinsic(CallInst &I, unsigned Op) {
|
|||||||
Op2.getOperand(0).getOpcode() == ISD::GlobalAddress &&
|
Op2.getOperand(0).getOpcode() == ISD::GlobalAddress &&
|
||||||
Op2.getOperand(1).getOpcode() == ISD::Constant) {
|
Op2.getOperand(1).getOpcode() == ISD::Constant) {
|
||||||
G = cast<GlobalAddressSDNode>(Op2.getOperand(0));
|
G = cast<GlobalAddressSDNode>(Op2.getOperand(0));
|
||||||
SrcOff += cast<ConstantSDNode>(Op2.getOperand(1))->getValue();
|
SrcDelta = cast<ConstantSDNode>(Op2.getOperand(1))->getValue();
|
||||||
}
|
}
|
||||||
if (G) {
|
if (G) {
|
||||||
GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal());
|
GlobalVariable *GV = dyn_cast<GlobalVariable>(G->getGlobal());
|
||||||
if (GV)
|
if (GV) {
|
||||||
Str = getStringValue(GV);
|
Str = getStringValue(GV);
|
||||||
|
if (!Str.empty()) {
|
||||||
|
CopyFromStr = true;
|
||||||
|
SrcOff += SrcDelta;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (unsigned i = 0; i < NumMemOps; i++) {
|
for (unsigned i = 0; i < NumMemOps; i++) {
|
||||||
@ -1681,7 +1687,7 @@ void SelectionDAGLowering::visitMemIntrinsic(CallInst &I, unsigned Op) {
|
|||||||
unsigned VTSize = getSizeInBits(VT) / 8;
|
unsigned VTSize = getSizeInBits(VT) / 8;
|
||||||
SDOperand Value, Chain, Store;
|
SDOperand Value, Chain, Store;
|
||||||
|
|
||||||
if (!Str.empty()) {
|
if (CopyFromStr) {
|
||||||
Value = getMemsetStringVal(VT, DAG, TLI, Str, SrcOff);
|
Value = getMemsetStringVal(VT, DAG, TLI, Str, SrcOff);
|
||||||
Chain = getRoot();
|
Chain = getRoot();
|
||||||
Store =
|
Store =
|
||||||
|
Loading…
x
Reference in New Issue
Block a user