assembler: Move struct relocation out of relocatable instructions

Now that all instructions (relocatable or not) are struct
brw_program_instructions, this means we can move the relocation specific
information out the "relocatable instruction" structure. This will allow
us to share the relocation information between different types of
instructions.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau
2013-01-30 17:09:17 +00:00
parent f6e9052e8d
commit 9b78f74f23
3 changed files with 43 additions and 42 deletions
+2 -3
View File
@@ -126,8 +126,7 @@ struct label_instruction {
char *name;
};
struct relocatable_instruction {
struct brw_instruction gen;
struct relocation {
char *first_reloc_target, *second_reloc_target; // JIP and UIP respectively
GLint first_reloc_offset, second_reloc_offset; // in number of instructions
};
@@ -141,9 +140,9 @@ struct brw_program_instruction {
unsigned inst_offset;
union {
struct brw_instruction gen;
struct relocatable_instruction reloc;
struct label_instruction label;
} insn;
struct relocation reloc;
struct brw_program_instruction *next;
};