Commit d1b5879e authored by Julian Kranz's avatar Julian Kranz

Merge

- Resolved conflicts
parent ed6c620e
...@@ -81,7 +81,7 @@ val rreil-show-linear lin = ...@@ -81,7 +81,7 @@ val rreil-show-linear lin =
val rreil-show-id id = val rreil-show-id id =
case id of case id of
| VIRT_EQ: "EQ" VIRT_EQ: "EQ"
| VIRT_NEQ: "NEQ" | VIRT_NEQ: "NEQ"
| VIRT_LES: "LES" | VIRT_LES: "LES"
| VIRT_LEU: "LEU" | VIRT_LEU: "LEU"
......
...@@ -126,14 +126,14 @@ val show/register r = ...@@ -126,14 +126,14 @@ val show/register r =
| MM5 : "MM5" | MM5 : "MM5"
| MM6 : "MM6" | MM6 : "MM6"
| MM7 : "MM7" | MM7 : "MM7"
| MM8 : "MM8" # | MM8 : "MM8"
| MM9 : "MM9" # | MM9 : "MM9"
| MM10 : "MM10" # | MM10 : "MM10"
| MM11 : "MM11" # | MM11 : "MM11"
| MM12 : "MM12" # | MM12 : "MM12"
| MM13 : "MM13" # | MM13 : "MM13"
| MM14 : "MM14" # | MM14 : "MM14"
| MM15 : "MM15" # | MM15 : "MM15"
| ES : "ES" | ES : "ES"
| SS : "SS" | SS : "SS"
| DS : "DS" | DS : "DS"
......
# vim:filetype=sml:ts=3:sw=3:expandtab # vim:filetype=sml:ts=3:sw=3:expandtab
export = translate translateBlock export = translate #translateBlock
val t-mode64? = do val t-mode64? = do
mode64 <- query $mode64; mode64 <- query $mode64;
...@@ -223,16 +223,6 @@ val fLEU = return (_var VIRT_LEU) ...@@ -223,16 +223,6 @@ val fLEU = return (_var VIRT_LEU)
val fLTS = return (_var VIRT_LTS) val fLTS = return (_var VIRT_LTS)
val fLTU = return (_var VIRT_LTU) val fLTU = return (_var VIRT_LTU)
val sdt-ss = return (var//0 (VIRT_T ~100))
val fOF = return (var//0 (ARCH_R ~1)) # OF
val fSF = return (var//0 (ARCH_R ~2)) # SF
val fZF = return (var//0 (ARCH_R ~3)) # ZF
val fAF = return (var//0 (ARCH_R ~4)) # AF
val fPF = return (var//0 (ARCH_R ~5)) # PF
val fCF = return (var//0 (ARCH_R ~6)) # CF
val fDF = return (var//0 (ARCH_R ~7)) # DF
val zero = return (SEM_LIN_IMM{imm=0}) val zero = return (SEM_LIN_IMM{imm=0})
val _if c _then a _else b = do val _if c _then a _else b = do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment