Fixed CSR Instruction Handlers and Use New Register Macros

Fixed CSR Instruction Handlers and Use New Register Macros #145