From 044ddd5196ef42a7fd7ac7c11d93f3d8ecb1c4d2 Mon Sep 17 00:00:00 2001
From: Michael Krasnitski <michael.krasnitski@gmail.com>
Date: Sun, 11 Feb 2024 19:31:42 -0500
Subject: Rearrange HLIL variants

The order of variants in the `lift` function didn't match the declared
order.
---
 rust/src/hlil/lift.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'rust/src/hlil/lift.rs')

diff --git a/rust/src/hlil/lift.rs b/rust/src/hlil/lift.rs
index 06338dea..e993bcae 100644
--- a/rust/src/hlil/lift.rs
+++ b/rust/src/hlil/lift.rs
@@ -28,6 +28,14 @@ pub struct HighLevelILLiftedInstruction {
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum HighLevelILLiftedInstructionKind {
+    Nop,
+    Break,
+    Continue,
+    Noret,
+    Unreachable,
+    Bp,
+    Undef,
+    Unimpl,
     Adc(LiftedBinaryOpCarry),
     Sbb(LiftedBinaryOpCarry),
     Rlc(LiftedBinaryOpCarry),
@@ -124,14 +132,6 @@ pub enum HighLevelILLiftedInstructionKind {
     IntrinsicSsa(LiftedIntrinsicSsa),
     Jump(LiftedJump),
     MemPhi(LiftedMemPhi),
-    Nop,
-    Break,
-    Continue,
-    Noret,
-    Unreachable,
-    Bp,
-    Undef,
-    Unimpl,
     Ret(LiftedRet),
     Split(LiftedSplit),
     StructField(LiftedStructField),
@@ -157,6 +157,7 @@ impl HighLevelILLiftedInstruction {
         use HighLevelILLiftedInstructionKind::*;
         use HighLevelILLiftedOperand as Operand;
         match &self.kind {
+            Nop | Break | Continue | Noret | Unreachable | Bp | Undef | Unimpl => vec![],
             Adc(op) | Sbb(op) | Rlc(op) | Rrc(op) => vec![
                 ("left", Operand::Expr(*op.left.clone())),
                 ("right", Operand::Expr(*op.right.clone())),
@@ -274,7 +275,6 @@ impl HighLevelILLiftedInstruction {
                 ("dest", Operand::Int(op.dest)),
                 ("src", Operand::IntList(op.src.clone())),
             ],
-            Nop | Break | Continue | Noret | Unreachable | Bp | Undef | Unimpl => vec![],
             Ret(op) => vec![("src", Operand::ExprList(op.src.clone()))],
             Split(op) => vec![
                 ("high", Operand::Expr(*op.high.clone())),
-- 
cgit v1.3.1