(Bsmiles32) Backport EntryHi macro