1217c1217,1221
< if (conditional)
---
> /* Also set flags on the macroop so that pre-microop decomposition
> branch prediction can work */
> setFlag(StaticInst::IsControl);
> setFlag(StaticInst::IsIndirectControl);
> if (conditional) {
1219c1223,1224
< else
---
> setFlag(StaticInst::IsCondControl);
> } else {
1221c1226,1228
< if (_base == INTREG_SP && _add && _imm == 4 && %(is_ras_pop)s)
---
> setFlag(StaticInst::IsUncondControl);
> }
> if (_base == INTREG_SP && _add && _imm == 4 && %(is_ras_pop)s) {
1222a1230,1231
> setFlag(StaticInst::IsReturn);
> }