820,821c820
< else if (traceData) {
< // If there was a fault, we shouldn't trace this instruction.
---
> else if (traceData && !DTRACE(ExecFaulting)) {