Merge pull request #19 from bamboo/unbox_any

introduce unbox_any
tomlokhorst · Aug 3, 2015 · 6cd8e1c · 6cd8e1c
2 parents 02917b6 + 18d55c7
commit 6cd8e1c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/Language/Cil/Build.hs b/src/Language/Cil/Build.hs
@@ -129,6 +129,7 @@ module Language.Cil.Build (
   , unaligned
   , unalignedPtr
   , unbox
+  , unbox_any
   , volatile
   , volatilePtr
   , xor
@@ -205,6 +206,9 @@ box = OpCode . Box
 unbox :: PrimitiveType -> MethodDecl
 unbox = OpCode . Unbox
 
+unbox_any :: PrimitiveType -> MethodDecl
+unbox_any = OpCode . Unbox_any
+
 br :: Label -> MethodDecl
 br = OpCode . Br
 

diff --git a/src/Language/Cil/Pretty.hs b/src/Language/Cil/Pretty.hs
@@ -294,6 +294,7 @@ instance Pretty OpCode where
   pr (Unaligned a)         = ("unaligned. " ++) . pr a
   pr (UnalignedPtr a opcode)  = ("unaligned. " ++) . pr a . sp . pr opcode
   pr (Unbox t)             = ("unbox " ++) . pr t
+  pr (Unbox_any t)         = ("unbox.any " ++) . pr t
   pr (Volatile)            = ("volatile." ++)
   pr (VolatilePtr opcode)  = ("volatile. " ++) . pr opcode
   pr (Xor)                 = ("xor" ++)

diff --git a/src/Language/Cil/Syntax.hs b/src/Language/Cil/Syntax.hs
@@ -397,6 +397,7 @@ data OpCode
   | Unaligned Alignment -- ^ Performs subsequent load or store operation under a weaker-than-usual alignment precondition.
   | UnalignedPtr  Alignment OpCode -- ^ Performs provided load or store operation under a weaker-than-usual alignment precondition.
   | Unbox PrimitiveType  -- ^ Pops 1 value, unboxes object reference, pushes value type.
+  | Unbox_any PrimitiveType  -- ^ Pops 1 value, unboxes and loads value, equivalent to unbox followed by ldobj
   | Volatile           -- ^ Marks subsequent pointer reference as volatile, i.e. the value it points at can be modified from another thread.
   | VolatilePtr OpCode -- ^ Marks provided pointer reference as volatile, i.e. the value it points at can be modified from another thread.
   | Xor                -- ^ Pops 2 values, do bitwise XOR between the values, pushes result.