Rename Jump to Terminator

radareorg · Mar 15, 2018 · c247036 · c247036
1 parent a682779
commit c247036
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/src/middle/ir_reader/lowering.rs b/src/middle/ir_reader/lowering.rs
@@ -155,25 +155,25 @@ impl<'a> LowerSsa<'a> {
 
         let next_node = opt_next_addr.map_or(Ok(self.exit_node), |a| self.block_at(a))?;
         match sbb.jump {
-            Some(sast::Jump::Uncond(tgt)) => {
+            Some(sast::Terminator::JmpUncond(tgt)) => {
                 let tgt_bb = self.block_at(tgt)?;
                 self.ssa.insert_control_edge(bb, tgt_bb, UNCOND_EDGE);
             }
-            Some(sast::Jump::Cond(sel_sop, if_tgt, opt_else_tgt)) => {
+            Some(sast::Terminator::JmpCond(sel_sop, if_tgt, opt_else_tgt)) => {
                 let sel_op = self.lower_operand(sel_sop)?;
                 let if_bb = self.block_at(if_tgt)?;
                 let else_bb = opt_else_tgt.map_or(Ok(next_node), |a| self.block_at(a))?;
                 self.ssa.set_selector(sel_op, bb);
                 self.ssa.insert_control_edge(bb, if_bb, TRUE_EDGE);
                 self.ssa.insert_control_edge(bb, else_bb, FALSE_EDGE);
             }
-            Some(sast::Jump::Indirect(sel_sop)) => {
+            Some(sast::Terminator::JmpIndirect(sel_sop)) => {
                 let sel_op = self.lower_operand(sel_sop)?;
                 self.ssa.set_selector(sel_op, bb);
                 self.ssa
                     .insert_control_edge(bb, self.exit_node, UNCOND_EDGE);
             }
-            Some(sast::Jump::Unreachable) => {
+            Some(sast::Terminator::Unreachable) => {
                 // nothing to do
             }
             None => {

diff --git a/src/middle/ir_reader/parser.lalrpop b/src/middle/ir_reader/parser.lalrpop
@@ -21,7 +21,7 @@ RegisterList: Vec<PhysReg> =
     "registers: " <Comma<PhysReg>> ";"                      => <>;
 
 BasicBlock: BasicBlock =
-    <addr:BBHeader> <ops:Operation*> <jump:Jump?>           => BasicBlock { <> };
+    <addr:BBHeader> <ops:Operation*> <jump:Terminator?>     => BasicBlock { <> };
 
 BBHeader: ir::MAddress =
     "bb_" <MAddress> "(" ")" ":"                            => <>;
@@ -58,11 +58,11 @@ Expr: Expr = {
     <ResizeType> <WidthSpec> "(" <Operand> ")"              => Expr::Resize(<>),
 };
 
-Jump: Jump = {
-    "JMP" <MAddress>                                        => Jump::Uncond(<>),
-    "JMP" "IF" <Operand> <MAddress> <("ELSE" <MAddress>)?>  => Jump::Cond(<>),
-    "JMP" "TO" <Operand>                                    => Jump::Indirect(<>),
-    "UNREACHABLE"                                           => Jump::Unreachable,
+Terminator: Terminator = {
+    "JMP" <MAddress>                                        => Terminator::JmpUncond(<>),
+    "JMP" "IF" <Operand> <MAddress> <("ELSE" <MAddress>)?>  => Terminator::JmpCond(<>),
+    "JMP" "TO" <Operand>                                    => Terminator::JmpIndirect(<>),
+    "UNREACHABLE"                                           => Terminator::Unreachable,
 };
 
 FinalRegState: Vec<(PhysReg, Operand)> =

diff --git a/src/middle/ir_reader/simple_ast.rs b/src/middle/ir_reader/simple_ast.rs
@@ -19,7 +19,7 @@ pub struct Function {
 pub struct BasicBlock {
     pub addr: ir::MAddress,
     pub ops: Vec<Operation>,
-    pub jump: Option<Jump>,
+    pub jump: Option<Terminator>,
 }
 
 #[derive(Debug)]
@@ -64,10 +64,10 @@ pub enum Operand {
 }
 
 #[derive(Debug)]
-pub enum Jump {
-    Uncond(ir::MAddress),
-    Cond(Operand, ir::MAddress, Option<ir::MAddress>),
-    Indirect(Operand),
+pub enum Terminator {
+    JmpUncond(ir::MAddress),
+    JmpCond(Operand, ir::MAddress, Option<ir::MAddress>),
+    JmpIndirect(Operand),
     Unreachable,
 }