c710a06ee0
The debugger override will set the initial request mask to the previously set request mask so use a different mask to assert enablement. Trap on wave start and end also run back to back, so fix the previous override mask check as well. In addition, unlike instruction traps, trap on wave start and end will not require a rewind of the program counter on wave exit.