6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-05 13:09:10 +00:00
Code Issues Projects Releases Wiki Activity

Support getelementptr instructions which use uint's to index into structure

Browse Source 
types and can have arbitrary 32- and 64-bit integer types indexing into
sequential types.

Auto-upgrade .ll files that use ubytes to index into structures to use uint's.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12652 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2004-04-05 01:30:04 +00:00
parent 5fa428fda9
commit 830b6f9868
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/AsmParser/llvmAsmParser.y
View File

@ -19,6 +19,7 @@
#include "llvm/iMemory.h" #include "llvm/iMemory.h"
#include "llvm/iOperators.h" #include "llvm/iOperators.h"
#include "llvm/iPHINode.h" #include "llvm/iPHINode.h"
#include "llvm/Support/GetElementPtrTypeIterator.h"
#include "Support/STLExtras.h" #include "Support/STLExtras.h"
#include <list> #include <list>
#include <utility> #include <utility>
@ -1235,6 +1236,17 @@ ConstExpr: CAST '(' ConstVal TO Types ')' {
if (!isa<PointerType>($3->getType())) if (!isa<PointerType>($3->getType()))
ThrowException("GetElementPtr requires a pointer operand!"); ThrowException("GetElementPtr requires a pointer operand!");
// LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct
// indices to uint struct indices for compatibility.
generic_gep_type_iterator<std::vector<Value*>::iterator>
GTI = gep_type_begin($3->getType(), $4->begin(), $4->end()),
GTE = gep_type_end($3->getType(), $4->begin(), $4->end());
for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI)
if (isa<StructType>(*GTI)) // Only change struct indices
if (ConstantUInt *CUI = dyn_cast<ConstantUInt>((*$4)[i]))
if (CUI->getType() == Type::UByteTy)
(*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
const Type *IdxTy = const Type *IdxTy =
GetElementPtrInst::getIndexedType($3->getType(), *$4, true); GetElementPtrInst::getIndexedType($3->getType(), *$4, true);
if (!IdxTy) if (!IdxTy)
@ -1979,8 +1991,21 @@ MemoryInst : MALLOC Types {
| GETELEMENTPTR Types ValueRef IndexList { | GETELEMENTPTR Types ValueRef IndexList {
if (!isa<PointerType>($2->get())) if (!isa<PointerType>($2->get()))
ThrowException("getelementptr insn requires pointer operand!"); ThrowException("getelementptr insn requires pointer operand!");
// LLVM 1.2 and earlier used ubyte struct indices. Convert any ubyte struct
// indices to uint struct indices for compatibility.
generic_gep_type_iterator<std::vector<Value*>::iterator>
GTI = gep_type_begin($2->get(), $4->begin(), $4->end()),
GTE = gep_type_end($2->get(), $4->begin(), $4->end());
for (unsigned i = 0, e = $4->size(); i != e && GTI != GTE; ++i, ++GTI)
if (isa<StructType>(*GTI)) // Only change struct indices
if (ConstantUInt *CUI = dyn_cast<ConstantUInt>((*$4)[i]))
if (CUI->getType() == Type::UByteTy)
(*$4)[i] = ConstantExpr::getCast(CUI, Type::UIntTy);
if (!GetElementPtrInst::getIndexedType(*$2, *$4, true)) if (!GetElementPtrInst::getIndexedType(*$2, *$4, true))
ThrowException("Can't get element ptr '" + (*$2)->getDescription()+ "'!"); ThrowException("Invalid getelementptr indices for type '" +
(*$2)->getDescription()+ "'!");
$$ = new GetElementPtrInst(getVal(*$2, $3), *$4); $$ = new GetElementPtrInst(getVal(*$2, $3), *$4);
delete $2; delete $4; delete $2; delete $4;
}; };