Debug opcode adjustments.

whitequark · Aug 19, 2012 · bc086e9 · bc086e9
1 parent b3361ed
commit bc086e9
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/lib/furnace-avm2/abc/opcodes/debug/as3_debugfile.rb b/lib/furnace-avm2/abc/opcodes/debug/as3_debugfile.rb
@@ -3,7 +3,11 @@ class AS3DebugFile < Opcode
     instruction 0xf1
 
     body do
-      vuint30 :index
+      const_ref :file, :string
+    end
+
+    def parameters
+      [ body.file ]
     end
 
     consume 0

diff --git a/lib/furnace-avm2/abc/opcodes/debug/as3_debugline.rb b/lib/furnace-avm2/abc/opcodes/debug/as3_debugline.rb
@@ -3,7 +3,11 @@ class AS3DebugLine < Opcode
     instruction 0xf0
 
     body do
-      vuint30 :linenum
+      vuint30 :line
+    end
+
+    def parameters
+      [ body.line ]
     end
 
     consume 0

diff --git a/lib/furnace-avm2/abc/opcodes/push_literal/as3_pushstring.rb b/lib/furnace-avm2/abc/opcodes/push_literal/as3_pushstring.rb
@@ -6,6 +6,10 @@ class AS3PushString < PushLiteralOpcode
       const_ref :value, :string
     end
 
+    def parameters
+      [ body.line ]
+    end
+
     type :string
   end
 end
diff --git a/lib/furnace-avm2/transform/cfg_build.rb b/lib/furnace-avm2/transform/cfg_build.rb
@@ -81,8 +81,10 @@ def transform(code, body)
           end
 
           # Skip nops
-          unless [ ABC::AS3Jump, ABC::AS3Label,
-                   ABC::AS3Kill, ABC::AS3Nop    ].include? opcode.class
+          unless [ ABC::AS3Jump,  ABC::AS3Label,
+                   ABC::AS3Kill,  ABC::AS3Nop,
+                   ABC::AS3Debug, ABC::AS3DebugFile, ABC::AS3DebugLine
+                 ].include? opcode.class
             @pending_queue << opcode
           end