Merge prepocessor-simulator improvements from LPC812 branch