Fix JMPI encoding for Haswell.

It uses the byte-aligned jump instead of 64-bit units.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
This commit is contained in:
Gwenole Beauchesne 2012-10-22 16:13:51 -04:00 committed by Damien Lespiau
parent 8aa952873c
commit 495c4e14e7

View File

@ -430,9 +430,13 @@ int main(int argc, char **argv)
// this is a branch instruction with one offset argument
int offset = inst->first_reloc_offset;
/* bspec: Unlike other flow control instructions, the offset used by JMPI is relative to the incremented instruction pointer rather than the IP value for the instruction itself. */
if(entry->instruction.header.opcode == BRW_OPCODE_JMPI)
int is_jmpi = entry->instruction.header.opcode == BRW_OPCODE_JMPI; // target relative to the post-incremented IP, so delta == 1 if JMPI
if(is_jmpi)
offset --;
offset = jump_distance(offset);
if (is_jmpi && (gen_level == 75))
offset = offset * 8;
if(!IS_GENp(6)) {
entry->instruction.bits3.JIP = offset;