Binary: Make the instruction and varible tags parameters of transformations.

Author: MathiasVP

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/Instruction.qll

@@ -1,7 +1,8 @@
 private import semmle.code.binary.ast.Location
 private import codeql.util.Option
 private import TranslatedElement
-private import semmle.code.binary.ast.ir.internal.InstructionTag
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
 private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
 private import Function
 private import TranslatedInstruction

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/Instruction0.qll

@@ -1,9 +1,11 @@
 import semmle.code.binary.ast.ir.internal.InstructionSig
 
 module Instruction0 implements InstructionSig {
-  import semmle.code.binary.ast.ir.internal.Instruction0.Instruction
-  import semmle.code.binary.ast.ir.internal.Instruction0.Function
-  import semmle.code.binary.ast.ir.internal.Instruction0.Operand
-  import semmle.code.binary.ast.ir.internal.Instruction0.Variable
-  import semmle.code.binary.ast.ir.internal.Instruction0.BasicBlock
+  import Instruction
+  import Function
+  import Operand
+  import Variable
+  import BasicBlock
+  import InstructionTag
+  import VariableTag
 }

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/InstructionTag.qll

@@ -0,0 +1,211 @@
+private import codeql.util.Boolean
+private import semmle.code.binary.ast.ir.internal.Opcode
+
+newtype TInstructionTag =
+  SingleTag() or
+  X86JumpInstrRefTag() or
+  X86JumpTag() or
+  X86CJumpInstrRefTag() or
+  X86CJumpTag() or
+  WriteTag() or
+  InitFramePtrTag() or
+  InitStackPtrTag() or
+  TestAndTag() or
+  TestZeroTag() or
+  TestCmpTag() or
+  ImmediateOperandConstTag() or
+  MemoryOperandConstFactorTag() or
+  MemoryOperandConstDisplacementTag() or
+  MemoryOperandMulTag() or
+  MemoryOperandAdd1Tag() or
+  MemoryOperandAdd2Tag() or
+  MemoryOperandLoadTag() or
+  PushSubTag() or
+  PushStoreTag() or
+  PushSubConstTag() or
+  PopAddTag() or
+  PopAddConstTag() or
+  PopLoadTag() or
+  DecOrIncConstTag() or
+  DecOrIncOpTag() or
+  BtShiftTag() or
+  BtAndTag() or
+  BtCmpTag() or
+  BtOneTag() or
+  BtZeroTag() or
+  BtrOneTag() or
+  BtrShiftTag() or
+  BtrNotTag() or
+  BtrAndTag() or
+  NegConstZeroTag() or
+  NegSubTag() or
+  CilLdcSizeTag() or
+  CilLdcConstTag() or
+  CilLdcSubTag() or
+  CilLdcWriteTag() or
+  CilStlocLoadTag() or
+  CilStlocAddTag() or
+  CilStlocConstTag() or
+  CilRelSubTag() or
+  CilRelCJumpTag() or
+  CilRelConstTag(Boolean b) or
+  CilRelRefTag() or
+  CilBoolBranchRefTag() or
+  CilBoolBranchSubTag() or
+  CilBoolBranchConstTag() or
+  CilBoolBranchCJumpTag() or
+  CilUnconditionalBranchTag() or
+  CilUnconditionalBranchRefTag()
+
+class InstructionTag extends TInstructionTag {
+  final string toString() {
+    this = SingleTag() and
+    result = "Single"
+    or
+    this = X86JumpInstrRefTag() and
+    result = "X86JumpInstrRef"
+    or
+    this = X86JumpTag() and
+    result = "X86Jump"
+    or
+    this = X86CJumpInstrRefTag() and
+    result = "X86CJumpInstrRef"
+    or
+    this = X86CJumpTag() and
+    result = "X86CJump"
+    or
+    this = WriteTag() and
+    result = "Write"
+    or
+    this = InitFramePtrTag() and
+    result = "InitFramePtr"
+    or
+    this = InitStackPtrTag() and
+    result = "InitStackPtr"
+    or
+    this = TestAndTag() and
+    result = "TestAnd"
+    or
+    this = TestZeroTag() and
+    result = "TestZero"
+    or
+    this = TestCmpTag() and
+    result = "TestCmp"
+    or
+    this = ImmediateOperandConstTag() and
+    result = "ImmediateOperandConst"
+    or
+    this = MemoryOperandConstFactorTag() and
+    result = "MemoryOperandConstFactor"
+    or
+    this = MemoryOperandConstDisplacementTag() and
+    result = "MemoryOperandConstDisplacement"
+    or
+    this = MemoryOperandMulTag() and
+    result = "MemoryOperandMul"
+    or
+    this = MemoryOperandAdd1Tag() and
+    result = "MemoryOperandAdd1"
+    or
+    this = MemoryOperandAdd2Tag() and
+    result = "MemoryOperandAdd2"
+    or
+    this = MemoryOperandLoadTag() and
+    result = "MemoryOperandLoad"
+    or
+    this = PushSubTag() and
+    result = "PushSub"
+    or
+    this = PushStoreTag() and
+    result = "PushStore"
+    or
+    this = PushSubConstTag() and
+    result = "PushSubConst"
+    or
+    this = PopAddTag() and
+    result = "PopAdd"
+    or
+    this = PopAddConstTag() and
+    result = "PopAddConst"
+    or
+    this = PopLoadTag() and
+    result = "PopLoad"
+    or
+    this = DecOrIncConstTag() and
+    result = "DecOrIncConst"
+    or
+    this = DecOrIncOpTag() and
+    result = "DecOrIncOp"
+    or
+    this = BtrOneTag() and
+    result = "BtrOne"
+    or
+    this = BtrShiftTag() and
+    result = "BtrShift"
+    or
+    this = BtrNotTag() and
+    result = "BtrNot"
+    or
+    this = BtrAndTag() and
+    result = "BtrAnd"
+    or
+    this = NegConstZeroTag() and
+    result = "NegConstZero"
+    or
+    this = NegSubTag() and
+    result = "NegSub"
+    or
+    this = CilLdcConstTag() and
+    result = "CilLdcConst"
+    or
+    this = CilLdcSizeTag() and
+    result = "CilLdcSize"
+    or
+    this = CilLdcSubTag() and
+    result = "CilLdcSub"
+    or
+    this = CilLdcWriteTag() and
+    result = "CilLdcWrite"
+    or
+    this = CilStlocLoadTag() and
+    result = "CilStlocLoad"
+    or
+    this = CilStlocAddTag() and
+    result = "CilStlocAdd"
+    or
+    this = CilStlocConstTag() and
+    result = "CilStlocConst"
+    or
+    this = CilRelSubTag() and
+    result = "CilRelSub"
+    or
+    this = CilRelCJumpTag() and
+    result = "CilRelCJump"
+    or
+    exists(boolean b |
+      this = CilRelConstTag(b) and
+      result = "CilRelConst(" + b.toString() + ")"
+    )
+    or
+    this = CilRelRefTag() and
+    result = "CilRelRef"
+    or
+    this = CilBoolBranchRefTag() and
+    result = "CilBoolBranchRef"
+    or
+    this = CilBoolBranchSubTag() and
+    result = "CilBoolBranchSub"
+    or
+    this = CilBoolBranchConstTag() and
+    result = "CilBoolBranchConst"
+    or
+    this = CilBoolBranchCJumpTag() and
+    result = "CilBoolBranchCJump"
+    or
+    this = CilUnconditionalBranchTag() and
+    result = "CilUnconditionalBranch"
+    or
+    this = CilUnconditionalBranchRefTag() and
+    result = "CilUnconditionalBranchRef"
+  }
+}

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/Operand.qll

@@ -1,6 +1,7 @@
 private import semmle.code.binary.ast.Location
 private import TranslatedElement
-private import semmle.code.binary.ast.ir.internal.InstructionTag as Tags
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
 private import Instruction
 private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
 private import Function
@@ -10,14 +11,14 @@ private import codeql.controlflow.SuccessorType
 private import BasicBlock
 
 newtype TOperand =
-  MkOperand(TranslatedElement te, Tags::InstructionTag tag, Tags::OperandTag operandTag) {
+  MkOperand(TranslatedElement te, InstructionTag tag, OperandTag operandTag) {
     exists(te.getVariableOperand(tag, operandTag))
   }
 
 class Operand extends TOperand {
   TranslatedElement te;
-  Tags::InstructionTag tag;
-  Tags::TOperandTag operandTag;
+  InstructionTag tag;
+  TOperandTag operandTag;
 
   Operand() { this = MkOperand(te, tag, operandTag) }
 
@@ -37,35 +38,37 @@ class Operand extends TOperand {
 }
 
 class StoreValueOperand extends Operand {
-  override Tags::StoreValueTag operandTag;
+  override StoreValueTag operandTag;
 }
 
 class LeftOperand extends Operand {
-  override Tags::LeftTag operandTag;
+  override LeftTag operandTag;
 }
 
 class RightOperand extends Operand {
-  override Tags::RightTag operandTag;
+  override RightTag operandTag;
 }
 
 class StoreAddressOperand extends Operand {
-  override Tags::StoreAddressTag operandTag;
+  override StoreAddressTag operandTag;
 }
 
 class UnaryOperand extends Operand {
-  override Tags::UnaryTag operandTag;
+  override UnaryTag operandTag;
 }
 
 class ConditionOperand extends Operand {
-  override Tags::CondTag operandTag;
+  override CondTag operandTag;
 }
 
 class ConditionJumpTargetOperand extends Operand {
-  override Tags::CondJumpTargetTag operandTag;
+  override CondJumpTargetTag operandTag;
 }
 
 class JumpTargetOperand extends Operand {
-  override Tags::JumpTargetTag operandTag;
+  override JumpTargetTag operandTag;
 }
 
+private import semmle.code.binary.ast.ir.internal.Tags as Tags
+
 class OperandTag = Tags::OperandTag;

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/TranslatedElement.qll

@@ -1,6 +1,8 @@
 private import semmle.code.binary.ast.instructions as Raw
 private import codeql.controlflow.SuccessorType
-private import semmle.code.binary.ast.ir.internal.InstructionTag
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
+private import VariableTag
 private import Instruction
 private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
 private import codeql.util.Either

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/TranslatedFunction.qll

@@ -5,7 +5,8 @@ private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
 private import Variable
 private import Instruction
 private import TranslatedInstruction
-private import semmle.code.binary.ast.ir.internal.InstructionTag
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
 private import codeql.controlflow.SuccessorType
 
 abstract class TranslatedFunction extends TranslatedElement {

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/TranslatedInstruction.qll

@@ -1,12 +1,14 @@
 private import semmle.code.binary.ast.instructions as Raw
 private import TranslatedElement
 private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
-private import semmle.code.binary.ast.ir.internal.InstructionTag
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
 private import Instruction
 private import Variable
 private import TranslatedFunction
 private import codeql.util.Option
 private import TranslatedOperand
+private import VariableTag
 private import codeql.controlflow.SuccessorType
 private import codeql.util.Either
 

binary/ql/lib/semmle/code/binary/ast/ir/internal/Instruction0/TranslatedOperand.qll

@@ -2,12 +2,14 @@ private import semmle.code.binary.ast.instructions as Raw
 private import TranslatedElement
 private import codeql.util.Option
 private import semmle.code.binary.ast.ir.internal.Opcode as Opcode
-private import semmle.code.binary.ast.ir.internal.InstructionTag
+private import semmle.code.binary.ast.ir.internal.Tags
+private import InstructionTag
 private import TranslatedInstruction
 private import Instruction
 private import Operand
 private import codeql.controlflow.SuccessorType
 private import Variable
+private import VariableTag
 
 abstract class TranslatedOperand extends TranslatedElement {
   abstract TranslatedInstruction getUse();