move Trap to the machine dependent modules