upstream changes for src/ppc/simulator-ppc.h