fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvc0/ir: make sure out-of-bounds buffer loads/atomics get a 0 result

Browse source 
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Ilia Mirkin 2016-05-15 15:35:04 -04:00
parent 4fb4fd0b6b
commit b1d74e9486
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
View file

@ -1328,6 +1328,25 @@ NVC0LoweringPass::handleATOM(Instruction *atom)
assert(base->reg.size == 8);
atom->setIndirect(0, 0, base);
atom->getSrc(0)->reg.file = FILE_MEMORY_GLOBAL;
// Harden against out-of-bounds accesses
Value *offset = bld.loadImm(NULL, atom->getSrc(0)->reg.data.offset + typeSizeof(atom->sType));
Value *length = loadBufLength32(ind, atom->getSrc(0)->reg.fileIndex * 16);
Value *pred = new_LValue(func, FILE_PREDICATE);
if (ptr)
bld.mkOp2(OP_ADD, TYPE_U32, offset, offset, ptr);
bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length);
atom->setPredicate(CC_NOT_P, pred);
if (atom->defExists(0)) {
Value *zero, *dst = atom->getDef(0);
atom->setDef(0, bld.getSSA());
bld.setPosition(atom, true);
bld.mkMov((zero = bld.getSSA()), bld.mkImm(0))
->setPredicate(CC_P, pred);
bld.mkOp2(OP_UNION, TYPE_U32, dst, atom->getDef(0), zero);
}
return true;
}
base =
@ -2107,7 +2126,13 @@ NVC0LoweringPass::handleLDST(Instruction *i)
bld.mkCmp(OP_SET, CC_GT, TYPE_U32, pred, TYPE_U32, offset, length);
i->setPredicate(CC_NOT_P, pred);
if (i->defExists(0)) {
bld.mkMov(i->getDef(0), bld.mkImm(0));
Value *zero, *dst = i->getDef(0);
i->setDef(0, bld.getSSA());
bld.setPosition(i, true);
bld.mkMov((zero = bld.getSSA()), bld.mkImm(0))
->setPredicate(CC_P, pred);
bld.mkOp2(OP_UNION, TYPE_U32, dst, i->getDef(0), zero);
}
}
}