riscv32: decouple from riscv64