diff options
| author | Brian Paul <brianp@vmware.com> | 2012-01-31 07:01:53 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-02-01 07:19:54 -0700 |
| commit | 541bb2e33f89b07bcbea2e27275df858760c8ec8 (patch) | |
| tree | 6a356adf5380e2f976c550e52653f57245be0e4a | |
| parent | a1471e4877515e2ce4fcc129c4ce26f5c306b193 (diff) | |
nv50: use larger arrays to silence warnings and fix buffer overflows
The warnings were:
nv50_pc_regalloc.c: In function ‘pass_generate_phi_movs’:
nv50_pc_regalloc.c:423:41: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp: In member function ‘bool nv50_ir::MemoryOpt::replaceStFromSt(nv50_ir::Instruction*, nv50_ir::MemoryOpt::Record*)’:
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
codegen/nv50_ir_peephole.cpp:1475:18: warning: array subscript is above array bounds
And add some assertions to catch this sooner in debug builds.
| -rw-r--r-- | src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_pc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp index fc025d8767..fb4041f0b8 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_peephole.cpp @@ -1463,7 +1463,7 @@ MemoryOpt::replaceStFromSt(Instruction *restrict st, Record *rec) st->takeExtraSources(0, extra); if (offR < offS) { - Value *vals[4]; + Value *vals[10]; int s, n; int k = 0; // get non-replaced sources of ri diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h index 45804d3a91..9abefa2f2a 100644 --- a/src/gallium/drivers/nv50/nv50_pc.h +++ b/src/gallium/drivers/nv50/nv50_pc.h @@ -234,7 +234,7 @@ struct nv_instruction { int serial; struct nv_value *def[4]; struct nv_value *flags_def; - struct nv_ref *src[5]; + struct nv_ref *src[6]; struct nv_ref *flags_src; struct nv_basic_block *bb; struct nv_basic_block *target; /* target block of control flow insn */ |