dissect.cstruct 4.0.dev3__tar.gz → 4.0.dev4__tar.gz

{dissect_cstruct-4.0.dev3/dissect.cstruct.egg-info → dissect_cstruct-4.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev3
+Version: 4.0.dev4
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect_cstruct-4.0.dev3 → dissect_cstruct-4.0.dev4}/dissect/cstruct/compiler.py

@@ -26,6 +26,7 @@ from dissect.cstruct.types import (
     Wchar,
     WcharArray,
 )
+from dissect.cstruct.types.enum import EnumMetaType
 from dissect.cstruct.types.packed import _struct
 
 if TYPE_CHECKING:
@@ -108,6 +109,7 @@ class _ReadSourceGenerator:
         preamble = """
         r = {}
         s = {}
+        o = stream.tell()
         """
 
         if any(field.bits for field in self.fields):
@@ -149,7 +151,7 @@ class _ReadSourceGenerator:
 
             if field.offset is not None and field.offset != current_offset:
                 # If a field has a set offset and it's not the same as the current tracked offset, seek to it
-                yield f"stream.seek({field.offset})"
+                yield f"stream.seek(o + {field.offset})"
                 current_offset = field.offset
 
             if self.align and field.offset is None:
@@ -158,6 +160,9 @@ class _ReadSourceGenerator:
         for field in self.fields:
             field_type = self.cs.resolve(field.type)
 
+            if isinstance(field_type, EnumMetaType):
+                field_type = field_type.type
+
             if not issubclass(field_type, SUPPORTED_TYPES):
                 raise TypeError(f"Unsupported type for compiler: {field_type}")
 
@@ -190,10 +195,10 @@ class _ReadSourceGenerator:
             # Bit fields
             elif field.bits:
                 if not prev_was_bits:
-                    prev_bits_type = field.type
+                    prev_bits_type = field_type
                     prev_was_bits = True
 
-                if bits_remaining == 0 or prev_bits_type != field.type:
+                if bits_remaining == 0 or prev_bits_type != field_type:
                     bits_remaining = (size * 8) - field.bits
                     bits_rollover = True
 

{dissect_cstruct-4.0.dev3 → dissect_cstruct-4.0.dev4/dissect.cstruct.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.cstruct
-Version: 4.0.dev3
+Version: 4.0.dev4
 Summary: A Dissect module implementing a parser for C-like structures: structure parsing in Python made easy
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Apache License 2.0

{dissect_cstruct-4.0.dev3 → dissect_cstruct-4.0.dev4}/tests/test_bitfield.py

@@ -1,3 +1,5 @@
+import io
+
 import pytest
 
 from dissect.cstruct.cstruct import cstruct
@@ -265,3 +267,31 @@ def test_bitfield_char(cs: cstruct, compiled: bool) -> None:
     assert obj.d == b"i420"
 
     assert obj.dumps() == buf
+
+
+def test_bitfield_dynamic(cs: cstruct, compiled: bool) -> None:
+    cdef = """
+    enum A : uint16 {
+        A = 0x0
+    };
+
+    struct test {
+        uint16  size : 4;
+        A       b : 4;
+        char    d[size];
+    };
+    """
+
+    cs.load(cdef, compiled=compiled)
+    assert verify_compiled(cs.test, compiled)
+
+    buf = io.BytesIO(b"\x00\x00\xF4\x00help")
+    buf.seek(2)
+    obj = cs.test(buf)
+
+    assert obj.size == 4
+    assert obj.b == 0xF
+    assert obj.d == b"help"
+
+    buf.seek(2)
+    assert obj.dumps() == buf.read()

{dissect_cstruct-4.0.dev3 → dissect_cstruct-4.0.dev4}/tests/test_compiler.py

@@ -323,4 +323,81 @@ def test_generate_bits_read(cs: cstruct, TestEnum: type[Enum]) -> None:
     assert code == dedent(expected)
 
 
-# TODO: the rest of the compiler
+@pytest.mark.parametrize("other_type", ["int8", "uint64"])
+def test_generate_fields_dynamic_after_bitfield(cs: cstruct, TestEnum: Enum, other_type: str) -> None:
+    _type = getattr(cs, other_type)
+
+    fields = [
+        Field("size", cs.uint16, offset=0),
+        Field("a", TestEnum, 4, offset=2),
+        Field("b", _type, 4),
+        Field("c", cs.char["size"], offset=3),
+    ]
+
+    output = "\n".join(compiler._ReadSourceGenerator(cs, fields)._generate_fields())
+
+    expected = """
+    buf = stream.read(2)
+    if len(buf) != 2: raise EOFError()
+    data = _struct(cls.cs.endian, "H").unpack(buf)
+
+    r["size"] = type.__call__(_0, data[0])
+    s["size"] = 2
+
+
+    _t = _1
+    r["a"] = type.__call__(_t, bit_reader.read(_t.type, 4))
+
+
+    _t = _2
+    r["b"] = type.__call__(_t, bit_reader.read(_t, 4))
+
+    bit_reader.reset()
+    stream.seek(o + 3)
+
+    _s = stream.tell()
+    r["c"] = _3._read(stream, context=r)
+    s["c"] = stream.tell() - _s
+    """
+
+    assert output.strip() == dedent(expected).strip()
+
+
+@pytest.mark.parametrize("other_type", ["int8", "uint64"])
+def test_generate_fields_dynamic_before_bitfield(cs: cstruct, TestEnum: Enum, other_type: str) -> None:
+    _type = getattr(cs, other_type)
+
+    fields = [
+        Field("size", cs.uint16, offset=0),
+        Field("a", _type, 4, offset=2),
+        Field("b", TestEnum, 4),
+        Field("c", cs.char["size"], offset=3),
+    ]
+
+    output = "\n".join(compiler._ReadSourceGenerator(cs, fields)._generate_fields())
+
+    expected = """
+    buf = stream.read(2)
+    if len(buf) != 2: raise EOFError()
+    data = _struct(cls.cs.endian, "H").unpack(buf)
+
+    r["size"] = type.__call__(_0, data[0])
+    s["size"] = 2
+
+
+    _t = _1
+    r["a"] = type.__call__(_t, bit_reader.read(_t, 4))
+
+
+    _t = _2
+    r["b"] = type.__call__(_t, bit_reader.read(_t.type, 4))
+
+    bit_reader.reset()
+    stream.seek(o + 3)
+
+    _s = stream.tell()
+    r["c"] = _3._read(stream, context=r)
+    s["c"] = stream.tell() - _s
+    """
+
+    assert output.strip() == dedent(expected).strip()