Merge pull request #130 from riscv/trap_entry_align-1