diff options
| author | Thomas Bauereiss | 2018-02-17 21:41:42 +0000 |
|---|---|---|
| committer | Thomas Bauereiss | 2018-02-17 21:41:42 +0000 |
| commit | 96211c216102d6dec5e0fa3dd5999dc13e1b4748 (patch) | |
| tree | 8802dd58383e2065c9d4788fc71d32360225e5d7 /src/gen_lib/sail_values.lem | |
| parent | 6bd490a9a3570fbb6f8a5979aaf4cd3ada3131d1 (diff) | |
| parent | 89f5441538355e98d236f85582daa12af1064722 (diff) | |
Merge master branch into sail2 for OCaml 4.06 compatibility
Diffstat (limited to 'src/gen_lib/sail_values.lem')
| -rw-r--r-- | src/gen_lib/sail_values.lem | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gen_lib/sail_values.lem b/src/gen_lib/sail_values.lem index 3d55843e..33caac37 100644 --- a/src/gen_lib/sail_values.lem +++ b/src/gen_lib/sail_values.lem @@ -801,9 +801,7 @@ let toNaturalFiveTup (n1,n2,n3,n4,n5) = type niafp = | NIAFP_successor | NIAFP_concrete_address of vector bitU - | NIAFP_LR - | NIAFP_CTR - | NIAFP_register of regfp + | NIAFP_indirect_address (* only for MIPS *) type diafp = @@ -834,15 +832,13 @@ end let niafp_to_nia reginfo = function | NIAFP_successor -> NIA_successor - | NIAFP_concrete_address v -> NIA_concrete_address (address_of_bitv (bits_of v)) - | NIAFP_LR -> NIA_LR - | NIAFP_CTR -> NIA_CTR - | NIAFP_register r -> NIA_register (regfp_to_reg reginfo r) + | NIAFP_concrete_address v -> NIA_concrete_address (address_of_bitv v) + | NIAFP_indirect_address -> NIA_indirect_address end let diafp_to_dia reginfo = function | DIAFP_none -> DIA_none - | DIAFP_concrete v -> DIA_concrete_address (address_of_bitv (bits_of v)) + | DIAFP_concrete v -> DIA_concrete_address (address_of_bitv v) | DIAFP_reg r -> DIA_register (regfp_to_reg reginfo r) end *) |