From e15ef43a243ae0e0db369cead1786f4f2c4e690e Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 4 Jul 2021 13:21:09 -0700
Subject: support xacquire/xrelease prefixing

---
 src/protected_mode/display.rs | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'src/protected_mode/display.rs')

diff --git a/src/protected_mode/display.rs b/src/protected_mode/display.rs
index c5892c2..0b11ea0 100644
--- a/src/protected_mode/display.rs
+++ b/src/protected_mode/display.rs
@@ -3324,8 +3324,14 @@ impl Instruction {
 }
 
 fn contextualize_intel<T: fmt::Write, Y: YaxColors>(instr: &Instruction, colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result {
+    if instr.xacquire() {
+        out.write_str("xacquire ")?;
+    }
+    if instr.xrelease() {
+        out.write_str("xrelease ")?;
+    }
     if instr.prefixes.lock() {
-        write!(out, "lock ")?;
+        out.write_str("lock ")?;
     }
 
     if instr.prefixes.rep_any() {
@@ -3436,8 +3442,23 @@ fn contextualize_intel<T: fmt::Write, Y: YaxColors>(instr: &Instruction, colors:
 fn contextualize_c<T: fmt::Write, Y: YaxColors>(instr: &Instruction, _colors: &Y, _address: u32, _context: Option<&NoContext>, out: &mut T) -> fmt::Result {
     let mut brace_count = 0;
 
+    let mut prefixed = false;
+
+    if instr.xacquire() {
+        out.write_str("xacquire ")?;
+        prefixed = true;
+    }
+    if instr.xrelease() {
+        out.write_str("xrelease ")?;
+        prefixed = true;
+    }
     if instr.prefixes.lock() {
-        out.write_str("lock { ")?;
+        out.write_str("lock ")?;
+        prefixed = true;
+    }
+
+    if prefixed {
+        out.write_str("{ ")?;
         brace_count += 1;
     }
 
-- 
cgit v1.1