pxcloud/spice-protocol
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-protocol synced 2025-12-27 15:08:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make pointers 32bit in new protocol format

Browse Source
This commit is contained in:
Alexander Larsson 2010-06-23 16:20:33 +02:00 committed by Marc-André Lureau
parent db5b8fa673
commit 1d5d5272e2
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python_modules/demarshal.py
View File

@ -184,7 +184,7 @@ def write_validate_struct_function(writer, struct):
def write_validate_pointer_item(writer, container, item, scope, parent_scope, start,
want_nw_size, want_mem_size, want_extra_size):
if want_nw_size:
writer.assign(item.nw_size(), 8)
writer.assign(item.nw_size(), item.type.get_fixed_nw_size())
if want_mem_size or want_extra_size:
target_type = item.type.target_type
@ -636,7 +636,7 @@ def write_switch_parser(writer, container, switch, dest, scope):
if t.is_struct():
write_container_parser(writer, t, dest2)
elif t.is_pointer():
write_parse_pointer(writer, t, False, dest2, m.name, not m.has_attr("ptr32"), block)
write_parse_pointer(writer, t, False, dest2, m.name, block)
elif t.is_primitive():
writer.assign(dest2.get_ref(m.name), "consume_%s(&in)" % (t.primitive_type()))
#TODO validate e.g. flags and enums
@ -724,12 +724,9 @@ def write_array_parser(writer, nelements, array, dest, scope):
dest2.reuse_scope = array_scope
write_container_parser(writer, element_type, dest2)
def write_parse_pointer(writer, t, at_end, dest, member_name, is_64bit, scope):
def write_parse_pointer(writer, t, at_end, dest, member_name, scope):
target_type = t.target_type
if is_64bit:
writer.assign("ptr_info[n_ptr].offset", "consume_uint64(&in)")
else:
writer.assign("ptr_info[n_ptr].offset", "consume_uint32(&in)")
writer.assign("ptr_info[n_ptr].offset", "consume_%s(&in)" % t.primitive_type())
writer.assign("ptr_info[n_ptr].parse", write_parse_ptr_function(writer, target_type))
if at_end:
writer.assign("ptr_info[n_ptr].dest", "end")
@ -756,9 +753,9 @@ def write_member_parser(writer, container, member, dest, scope):
if t.is_pointer():
if member.has_attr("nocopy"):
writer.comment("Reuse data from network message").newline()
writer.assign(dest.get_ref(member.name), "(size_t)(message_start + consume_uint64(&in))")
writer.assign(dest.get_ref(member.name), "(size_t)(message_start + consume_%s(&in))" % t.primitive_type())
else:
write_parse_pointer(writer, t, member.has_end_attr(), dest, member.name, not member.has_attr("ptr32"), scope)
write_parse_pointer(writer, t, member.has_end_attr(), dest, member.name, scope)
elif t.is_primitive():
if member.has_end_attr():
writer.statement("*(%s *)end = consume_%s(&in)" % (t.c_type(), t.primitive_type()))

4
python_modules/marshal.py
View File

@ -239,7 +239,7 @@ def write_switch_marshaller(writer, container, switch, src, scope):
write_container_marshaller(writer, t, src2)
elif t.is_pointer():
ptr_func = write_marshal_ptr_function(writer, t.target_type)
writer.assign("*%s_out" % (writer.out_prefix + m.name), "spice_marshaller_get_ptr_submarshaller(m, %s)" % ("0" if m.has_attr("ptr32") else "1"))
writer.assign("*%s_out" % (writer.out_prefix + m.name), "spice_marshaller_get_ptr_submarshaller(m, %d)" % (1 if m.get_fixed_nw_size() == 8 else 0))
elif t.is_primitive():
if m.has_attr("zero"):
writer.statement("spice_marshaller_add_%s(m, 0)" % (t.primitive_type()))
@ -285,7 +285,7 @@ def write_member_marshaller(writer, container, member, src, scope):
# else:
# write_parse_pointer(writer, t, member.has_end_attr(), src, member.name, scope)
ptr_func = write_marshal_ptr_function(writer, t.target_type)
writer.assign("*%s_out" % (writer.out_prefix + member.name), "spice_marshaller_get_ptr_submarshaller(m, %s)" % ("0" if member.has_attr("ptr32") else "1"))
writer.assign("*%s_out" % (writer.out_prefix + member.name), "spice_marshaller_get_ptr_submarshaller(m, %d)" % (1 if member.get_fixed_nw_size() == 8 else 0))
elif t.is_primitive():
if member.has_attr("zero"):
writer.statement("spice_marshaller_add_%s(m, 0)" % (t.primitive_type()))

4
python_modules/ptypes.py
View File

@ -4,6 +4,8 @@ import types
_types_by_name = {}
_types = []
default_pointer_size = 4
def type_exists(name):
return _types_by_name.has_key(name)
@ -426,7 +428,7 @@ class PointerType(Type):
Type.__init__(self)
self.name = None
self.target_type = target_type
self.pointer_size = 8
self.pointer_size = default_pointer_size
def __str__(self):
return "%s*" % (str(self.target_type))

4
spice_codegen.py
View File

@ -115,6 +115,8 @@ parser.add_option("-i", "--include",
help="Include FILE in generated code")
parser.add_option("--prefix", dest="prefix",
help="set public symbol prefix", default="")
parser.add_option("--ptrsize", dest="ptrsize",
help="set default pointer size", default="4")
(options, args) = parser.parse_args()
@ -124,6 +126,8 @@ if len(args) == 0:
if len(args) == 1:
parser.error("No destination file specified")
ptypes.default_pointer_size = int(options.ptrsize)
proto_file = args[0]
dest_file = args[1]
proto = spice_parser.parse(proto_file)