From 73def6eadc7a1f3e3465b972b774f26fcf8446bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pekka=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Fri, 4 May 2018 19:46:16 +0000 Subject: [PATCH] [BRIGFE] Fix handling of NOPs. From-SVN: r259958 --- gcc/brig/ChangeLog | 4 ++++ gcc/brig/brigfrontend/brig-basic-inst-handler.cc | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gcc/brig/ChangeLog b/gcc/brig/ChangeLog index ce4aea615eb..0a2846d3924 100644 --- a/gcc/brig/ChangeLog +++ b/gcc/brig/ChangeLog @@ -1,3 +1,7 @@ +2018-05-04 Pekka Jääskeläinen + + * brig/brigfrontend/brig-basic-inst-handler.cc: Fix handling of NOPs. + 2018-05-04 Pekka Jääskeläinen Add flag -fassume-phsa that is on by default. If -fno-assume-phsa diff --git a/gcc/brig/brigfrontend/brig-basic-inst-handler.cc b/gcc/brig/brigfrontend/brig-basic-inst-handler.cc index c8224ae6a51..75e1cfac7dd 100644 --- a/gcc/brig/brigfrontend/brig-basic-inst-handler.cc +++ b/gcc/brig/brigfrontend/brig-basic-inst-handler.cc @@ -447,6 +447,8 @@ size_t brig_basic_inst_handler::operator () (const BrigBase *base) { const BrigInstBase *brig_inst = (const BrigInstBase *) base; + if (brig_inst->opcode == BRIG_OPCODE_NOP) + return base->byteCount; tree_stl_vec operands = build_operands (*brig_inst); @@ -466,11 +468,9 @@ brig_basic_inst_handler::operator () (const BrigBase *base) BrigType16_t brig_inst_type = brig_inst->type; - if (brig_inst->opcode == BRIG_OPCODE_NOP) - return base->byteCount; - else if (brig_inst->opcode == BRIG_OPCODE_FIRSTBIT - || brig_inst->opcode == BRIG_OPCODE_LASTBIT - || brig_inst->opcode == BRIG_OPCODE_SAD) + if (brig_inst->opcode == BRIG_OPCODE_FIRSTBIT + || brig_inst->opcode == BRIG_OPCODE_LASTBIT + || brig_inst->opcode == BRIG_OPCODE_SAD) /* These instructions are reported to be always 32b in HSAIL, but we want to treat them according to their input argument's type to select the correct instruction/builtin. */ -- 2.30.2