Sign-extend array index expressions to work correctly on non-32 bit machines.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3496 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp
index e33622f..f4fb7a2 100644
--- a/lib/Target/CBackend/CBackend.cpp
+++ b/lib/Target/CBackend/CBackend.cpp
@@ -210,7 +210,8 @@
case Type::PointerTyID: {
const PointerType *PTy = cast<PointerType>(Ty);
- return printType(PTy->getElementType(), "(*" + NameSoFar + ")");
+ std::string ptrName = NameSoFar.length()? "(*"+NameSoFar+")" : string("*");
+ return printType(PTy->getElementType(), ptrName);
}
case Type::ArrayTyID: {
@@ -844,16 +845,20 @@
Out << (HasImplicitAddress ? "." : "->");
Out << "field" << cast<ConstantUInt>(*(I+1))->getValue();
I += 2;
- } else { // Performing array indexing. Just skip the 0
+ } else { // First array index of 0: Just skip it
++I;
}
}
for (; I != E; ++I)
if ((*I)->getType() == Type::UIntTy) {
- Out << "[";
+ Out << "[((int) ("; // sign-extend from 32 (to 64) bits
writeOperand(*I);
- Out << "]";
+ Out << " * sizeof(";
+ printType(cast<PointerType>(Ptr->getType())->getElementType());
+ Out << "))) / sizeof(";
+ printType(cast<PointerType>(Ptr->getType())->getElementType());
+ Out << ")]";
} else {
Out << ".field" << cast<ConstantUInt>(*I)->getValue();
}