Possibly need to change immediate generator and address adder. Refer to pg 16 of riscv user spec v2.2
