summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon French2018-05-11 17:26:27 +0100
committerJon French2018-05-11 17:26:27 +0100
commiteba4bcaebd7cddda799a4e192add09431b5d4099 (patch)
tree717666d5186c9aebd56023f229dcfa6067ce4cd7
parent0e7a57c63b0430b4d5b126a3ddce26eacf1f272c (diff)
...and actually working
-rw-r--r--riscv/main.sail2
-rw-r--r--riscv/riscv.sail2
2 files changed, 3 insertions, 1 deletions
diff --git a/riscv/main.sail b/riscv/main.sail
index 43820e25..8accaf5b 100644
--- a/riscv/main.sail
+++ b/riscv/main.sail
@@ -43,6 +43,8 @@ function main () = {
print(assembly(assembly("ldu.aq zero, zero, 0x0")));
print_bits("assembled lui zero, 0x0: ", encdec(assembly("lui zero, 0x0")));
print_bits("assembled jal zero, 0x123456 : ", encdec(assembly("jal zero, 0x123456")));
+ print(assembly(assembly("beq zero, zero, 0x124")));
+ print_bits("assembled beq zero, zero, 0x124 : ", encdec(assembly("beq zero, zero, 0x124")));
/*PC = __GetSlice_int(64, elf_entry(), 0);
try {
init_sys ();
diff --git a/riscv/riscv.sail b/riscv/riscv.sail
index 6ede17b1..84f0f279 100644
--- a/riscv/riscv.sail
+++ b/riscv/riscv.sail
@@ -149,7 +149,7 @@ mapping btype_mnemonic = {
RISCV_BGEU <-> "bgeu"
}
-mapping clause assembly = BTYPE(imm, rs2, rs1, op) <-> btype_mnemonic(op) ^^ spaces() ^^ reg_name(rs1) ^^ operand_sep() ^^ reg_name(rs2) ^^ operand_sep() ^^ hex_bits_13(imm)
+mapping clause assembly = BTYPE(imm, rs2, rs1, op) <-> btype_mnemonic(op) ^^ spaces() ^^ reg_name(rs1) ^^ operand_sep() ^^ reg_name(rs2) ^^ operand_sep() ^^ hex_bits_13(imm)
/* ****************************************************************** */