r300/compiler: Move declaration before code.
Fixes these GCC warnings on linux-x86 build. radeon_dataflow_deadcode.c: In function ‘push_branch’: radeon_dataflow_deadcode.c:112: warning: ISO C90 forbids mixed declarations and code radeon_dataflow_deadcode.c: In function ‘update_instruction’: radeon_dataflow_deadcode.c:183: warning: ISO C90 forbids mixed declarations and code radeon_dataflow_deadcode.c: In function ‘rc_dataflow_deadcode’: radeon_dataflow_deadcode.c:352: warning: ISO C90 forbids mixed declarations and code radeon_dataflow_deadcode.c:379: warning: ISO C90 forbids mixed declarations and code
This commit is contained in:
parent
6abd7771c6
commit
07a38505c6
|
@ -106,10 +106,12 @@ static void push_loop(struct deadcode_state * s)
|
||||||
|
|
||||||
static void push_branch(struct deadcode_state * s)
|
static void push_branch(struct deadcode_state * s)
|
||||||
{
|
{
|
||||||
|
struct branchinfo * branch;
|
||||||
|
|
||||||
memory_pool_array_reserve(&s->C->Pool, struct branchinfo, s->BranchStack,
|
memory_pool_array_reserve(&s->C->Pool, struct branchinfo, s->BranchStack,
|
||||||
s->BranchStackSize, s->BranchStackReserved, 1);
|
s->BranchStackSize, s->BranchStackReserved, 1);
|
||||||
|
|
||||||
struct branchinfo * branch = &s->BranchStack[s->BranchStackSize++];
|
branch = &s->BranchStack[s->BranchStackSize++];
|
||||||
branch->HaveElse = 0;
|
branch->HaveElse = 0;
|
||||||
memcpy(&branch->StoreEndif, &s->R, sizeof(s->R));
|
memcpy(&branch->StoreEndif, &s->R, sizeof(s->R));
|
||||||
}
|
}
|
||||||
|
@ -152,6 +154,7 @@ static void update_instruction(struct deadcode_state * s, struct rc_instruction
|
||||||
const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode);
|
const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode);
|
||||||
struct instruction_state * insts = &s->Instructions[inst->IP];
|
struct instruction_state * insts = &s->Instructions[inst->IP];
|
||||||
unsigned int usedmask = 0;
|
unsigned int usedmask = 0;
|
||||||
|
unsigned int srcmasks[3];
|
||||||
|
|
||||||
if (opcode->HasDstReg) {
|
if (opcode->HasDstReg) {
|
||||||
unsigned char * pused = get_used_ptr(s, inst->U.I.DstReg.File, inst->U.I.DstReg.Index);
|
unsigned char * pused = get_used_ptr(s, inst->U.I.DstReg.File, inst->U.I.DstReg.Index);
|
||||||
|
@ -180,7 +183,6 @@ static void update_instruction(struct deadcode_state * s, struct rc_instruction
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int srcmasks[3];
|
|
||||||
rc_compute_sources_for_writemask(inst, usedmask, srcmasks);
|
rc_compute_sources_for_writemask(inst, usedmask, srcmasks);
|
||||||
|
|
||||||
for(unsigned int src = 0; src < opcode->NumSrcRegs; ++src) {
|
for(unsigned int src = 0; src < opcode->NumSrcRegs; ++src) {
|
||||||
|
@ -219,6 +221,7 @@ void rc_dataflow_deadcode(struct radeon_compiler * c, void *user)
|
||||||
unsigned int nr_instructions;
|
unsigned int nr_instructions;
|
||||||
unsigned has_temp_reladdr_src = 0;
|
unsigned has_temp_reladdr_src = 0;
|
||||||
rc_dataflow_mark_outputs_fn dce = (rc_dataflow_mark_outputs_fn)user;
|
rc_dataflow_mark_outputs_fn dce = (rc_dataflow_mark_outputs_fn)user;
|
||||||
|
unsigned int ip;
|
||||||
|
|
||||||
/* Give up if there is relative addressing of destination operands. */
|
/* Give up if there is relative addressing of destination operands. */
|
||||||
for(struct rc_instruction * inst = c->Program.Instructions.Next;
|
for(struct rc_instruction * inst = c->Program.Instructions.Next;
|
||||||
|
@ -349,12 +352,14 @@ void rc_dataflow_deadcode(struct radeon_compiler * c, void *user)
|
||||||
update_instruction(&s, inst);
|
update_instruction(&s, inst);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int ip = 0;
|
ip = 0;
|
||||||
for(struct rc_instruction * inst = c->Program.Instructions.Next;
|
for(struct rc_instruction * inst = c->Program.Instructions.Next;
|
||||||
inst != &c->Program.Instructions;
|
inst != &c->Program.Instructions;
|
||||||
inst = inst->Next, ++ip) {
|
inst = inst->Next, ++ip) {
|
||||||
const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode);
|
const struct rc_opcode_info * opcode = rc_get_opcode_info(inst->U.I.Opcode);
|
||||||
int dead = 1;
|
int dead = 1;
|
||||||
|
unsigned int srcmasks[3];
|
||||||
|
unsigned int usemask;
|
||||||
|
|
||||||
if (!opcode->HasDstReg) {
|
if (!opcode->HasDstReg) {
|
||||||
dead = 0;
|
dead = 0;
|
||||||
|
@ -376,8 +381,7 @@ void rc_dataflow_deadcode(struct radeon_compiler * c, void *user)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int srcmasks[3];
|
usemask = s.Instructions[ip].WriteMask;
|
||||||
unsigned int usemask = s.Instructions[ip].WriteMask;
|
|
||||||
|
|
||||||
if (inst->U.I.WriteALUResult == RC_ALURESULT_X)
|
if (inst->U.I.WriteALUResult == RC_ALURESULT_X)
|
||||||
usemask |= RC_MASK_X;
|
usemask |= RC_MASK_X;
|
||||||
|
|
Loading…
Reference in New Issue