Merge branch 'master' of bitbucket.org:Peter_Sewell/sail

# Conflicts:
#	risc-v/hgen/types.hgen

1 files changed, 0 insertions, 2 deletions

diff --git a/risc-v/hgen/types.hgen b/risc-v/hgen/types.hgen
index bb6d164c..11d0921e 100644
--- a/risc-v/hgen/types.hgen
+++ b/risc-v/hgen/types.hgen
@@ -108,7 +108,6 @@ let pp_riscv_load_op (unsigned, width, aq) =
   | (false, RISCVWORD)    -> "lw"
   | (true,  RISCVWORD)    -> "lwu"
   | (_, RISCVDOUBLE)      -> "ld"
-  | _                     -> failwith "unexpected load op"
   end
   ^ (if aq then ".aq" else "")
 
@@ -117,7 +116,6 @@ let pp_riscv_store_op width = match width with
 | RISCVHALF -> "sh"
 | RISCVWORD -> "sw"
 | RISCVDOUBLE -> "sd"
-| _ -> failwith "unexpected store op"
 
 let pp_riscv_fence_option = function
   | 0b0011 -> "rw"