add traptype and trapaddr to PowerDecoder2. idea is to actually *change*