diff options
| author | Alasdair Armstrong | 2017-08-14 17:04:06 +0100 |
|---|---|---|
| committer | Alasdair Armstrong | 2017-08-14 17:04:06 +0100 |
| commit | 96642bd568bd76d79ab3cc82aa66288e022467ab (patch) | |
| tree | 6e7ba30186d7ebfa7e01d45baa9c04a9ab231d3f | |
| parent | 6fc1333da75560f78582271fb7be9cbebafeb2be (diff) | |
| parent | 94fa8f92644209ca3ffb4242c98eb92c8d58e2ae (diff) | |
Merge remote-tracking branch 'origin/sail_new_tc' into experiments
| -rw-r--r-- | x86/x64.sail | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x86/x64.sail b/x86/x64.sail index a5e0710c..3b25802f 100644 --- a/x86/x64.sail +++ b/x86/x64.sail @@ -228,10 +228,10 @@ function ea ea_src ((size) sz, (dest_src) ds) = case (R_rm (_, v)) -> ea_rm (sz, v) } -function ea ea_imm_rm ((size) sz, (imm_rm) i_rm) = +function ea ea_imm_rm ((imm_rm) i_rm) = switch i_rm { - case (Rm (v)) -> ea_rm (sz, v) - case (Imm (v)) -> Ea_i (sz, v) + case (Rm (v)) -> ea_rm (Sz64, v) + case (Imm (v)) -> Ea_i (Sz64, v) } function qword restrict_size ((size) sz, (qword) imm) = @@ -553,7 +553,7 @@ function unit push_aux ((qword) w) = function unit pop ((rm) r) = wEA (ea_rm (Sz64,r)) := pop_aux() function unit pop_rip () = RIP := pop_aux() -function unit push ((imm_rm) i) = push_aux (EA (ea_imm_rm (Sz64, i))) +function unit push ((imm_rm) i) = push_aux (EA (ea_imm_rm (i))) function unit push_rip () = push_aux (RIP) function unit drop ((qword) i) = if i[7 ..0] != 0 then () else RSP := RSP + i @@ -586,7 +586,7 @@ union ast member imm_rm CALL function clause execute (CALL (i)) = { push_rip(); - jump_to_ea (ea_imm_rm (Sz64, i)) + jump_to_ea (ea_imm_rm (i)) } (* ========================================================================== |