em400: debugger cleanup contd.
Merge conflict resolution
merge leftovers
em400: debugger parser changes, contd.