(Bsmiles32) Backport - Replace BadVAddr macro