debugger: update debugger code for r15 and r16