traps: x86: finalize unification of traps.c