[Spice-devel,v2,33/43] Implement ws_inline attribute

Submitted by Frediano Ziglio on July 8, 2015, 1:54 p.m.

Details

Message ID 1436363656-4266-34-git-send-email-fziglio@redhat.com
State New
Headers show

Not browsing as part of any series.

Commit Message

Frediano Ziglio July 8, 2015, 1:54 p.m.
This attribute allow structure to be aligned instead of be contained
in a separate function.
This is helpful as variable are declared in the function so allows
other member to reference to a nested structure.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
---
 python_modules/dissector.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/python_modules/dissector.py b/python_modules/dissector.py
index b204c61..3d822cc 100644
--- a/python_modules/dissector.py
+++ b/python_modules/dissector.py
@@ -378,9 +378,14 @@  def write_struct_func(writer, t, func_name, index):
 def write_struct(writer, member, t, index, dest, scope):
     assert(t.is_struct())
 
-    func_name = 'dissect_spice_struct_' + t.name
-    write_struct_func(writer, t, func_name, index)
-    writer.assign('offset', '%s(glb, %s, offset, %s)' % (func_name, dest.level.tree, index))
+    if member.has_attr('ws_inline'):
+        dest = dest.child_sub(member.name, scope)
+        with writer.block() as scope:
+            write_container_parser(writer, t, dest)
+    else:
+        func_name = 'dissect_spice_struct_' + t.name
+        write_struct_func(writer, t, func_name, index)
+        writer.assign('offset', '%s(glb, %s, offset, %s)' % (func_name, dest.level.tree, index))
 
 def write_member_primitive(writer, container, member, t, dest, scope):
     assert(t.is_primitive())