Fix incorrect bitfield size for bitfields larger than 8 bits

Author: GAMMACASE

generator_scripts/generate_cpp.py

@@ -1,9 +1,9 @@
 from enum import Enum
 import os
 import re
-from generator_scripts.common import ArgsFlags, align_value, get_hl2sdk_common_types, locate_input_path, parse_args_as_flags, prepare_out_path
+from generator_scripts.common import Helpers, ArgsFlags, align_value, get_hl2sdk_common_types, locate_input_path, parse_args_as_flags, prepare_out_path
 from generator_scripts.obj_defs import ClassObjectMember, EnumObjectField, ObjectDefinition, ObjectTypes, SubType, SubTypeAtomic, SubTypeTypes
-from generator_scripts.schema_file import Helpers, SchemaFile, FileWriter
+from generator_scripts.schema_file import SchemaFile, FileWriter
 import argparse
 
 args = None
@@ -46,18 +46,37 @@ def class_definition(self, class_obj: ObjectDefinition):
 			current_offset += 8
 
 		bitfield_accum = 0
+		bitfield_size = 1
+		bitfield_last_member = 0
 		previous_member_alignment = 0
 
-		for member in class_obj.get_members():
+		for i, member in enumerate(class_obj.get_members()):
 			member_size = member.get_type().get_size()
 			member_alignment = member.get_type().get_alignment()
 
 			# Bitfields don't have any offset set
 			if member.get_type().type == SubTypeTypes.BITFIELD and member.offset == 0:
+				# If it's a start of a bitfield sequence, find largest alignment needed for it
+				if bitfield_accum == 0:
+					for j in range(i, len(class_obj.get_members())):
+						adv_member = class_obj.get_members()[j]
+						if adv_member.get_type().type == SubTypeTypes.BITFIELD and adv_member.offset == 0:
+							size_needed = int((adv_member.get_type().bits_count + 7) / 8)
+
+							if size_needed > bitfield_size:
+								bitfield_size = size_needed
+						else:
+							bitfield_last_member = j
+							break
+					for j in range(i, bitfield_last_member):
+						class_obj.get_members()[j].get_type().expected_size = bitfield_size
+
 				bitfield_accum += member.get_type().bits_count
 			else:
 				if bitfield_accum != 0:
 					current_offset += int((bitfield_accum + 7) / 8)
+					bitfield_size = 1
+					bitfield_last_member = 0
 					bitfield_accum = 0
 
 				# Prevent unnecessary padding caused by alignment but ignore any packed classes
@@ -76,6 +95,8 @@ def class_definition(self, class_obj: ObjectDefinition):
 
 		if bitfield_accum != 0:
 			current_offset += int((bitfield_accum + 7) / 8)
+			bitfield_size = 1
+			bitfield_last_member = 0
 			bitfield_accum = 0
 
 		if align_value(current_offset, class_alignment) < class_obj.size:

generator_scripts/generate_cpp_defs.py

@@ -1,9 +1,8 @@
-from enum import Enum
 import os
 from generate_cpp import CppContext, CppWriter
 from generator_scripts.common import ArgsFlags, locate_input_path, parse_args_as_flags, prepare_out_path, get_hl2sdk_common_types
-from generator_scripts.obj_defs import ClassObjectMember, EnumObjectField, ObjectDefinition, ObjectTypes, SubType, SubTypeAtomic, SubTypeTypes
-from generator_scripts.schema_file import Helpers, SchemaFile
+from generator_scripts.obj_defs import ClassObjectMember, ObjectDefinition, SubTypeAtomic, SubTypeTypes
+from generator_scripts.schema_file import SchemaFile
 import argparse
 
 args = None

generator_scripts/generator_scripts/common.py

@@ -2,6 +2,21 @@
 import os
 import glob
 
+class Helpers:
+	@staticmethod
+	def size_to_int(size, signed = False):
+		match size:
+			case 1:
+				return 'uint8' if not signed else 'int8'
+			case 2:
+				return 'uint16' if not signed else 'int16'
+			case 4:
+				return 'uint32' if not signed else 'int32'
+			case 8:
+				return 'uint64' if not signed else 'int64'
+			case _:
+				raise Exception(f'Invalid size ({size}) to int was performed!')
+
 class ArgsFlags(IntFlag):
 	Empty = 0,
 	AddComments = (1 << 0),

generator_scripts/generator_scripts/obj_defs.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Union
 
-from generator_scripts.common import align_value
+from generator_scripts.common import align_value, Helpers
 
 alignment_overrides = {
 	'EngineLoopState_t': 8
@@ -280,6 +280,7 @@ def parse_from(obj_list: 'ObjectList', raw_pointer):
 
 class SubTypeBitfield:
 	bits_count = 0
+	expected_size = 1
 
 	def __init__(self):
 		pass
@@ -294,7 +295,7 @@ def get_alignment(self):
 		return 0
 
 	def as_str(self, var_name = None):
-		return f'int8{" " + var_name if var_name is not None else ""} : {self.bits_count}'
+		return f'{Helpers.size_to_int(self.expected_size)}{" " + var_name if var_name is not None else ""} : {self.bits_count}'
 
 	@property
 	def type(self):

generator_scripts/generator_scripts/schema_file.py

@@ -1,4 +1,3 @@
-from enum import IntFlag
 import os
 import json
 from generator_scripts.common import ArgsFlags
@@ -120,18 +119,4 @@ def write_comment_check(self, comment):
 		if self.has_flag(ArgsFlags.AddComments):
 			return self.write_comment(comment)
 		return self
-
-class Helpers:
-	@staticmethod
-	def size_to_int(size, signed = False):
-		match size:
-			case 1:
-				return 'uint8' if not signed else 'int8'
-			case 2:
-				return 'uint16' if not signed else 'int16'
-			case 4:
-				return 'uint32' if not signed else 'int32'
-			case 8:
-				return 'uint64' if not signed else 'int64'
-			case _:
-				raise Exception(f'Invalid size ({size}) to int was performed!')
+