Add beta2 patch: merge in old trap skip logic again; give trap priority over hw interrupts

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2741

include/cpu.h

@@ -446,6 +446,7 @@ struct CPUBlock {
 		Bitu which,error;
 	} exception;
 	Bits direction;
+	bool trap_skip;
 	Bit32u drx[8];
 	Bit32u trx[8];
 };