X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_struct.c;h=ab0d9a1a9fe2545d6bcbea572e1f81e952fe7d94;hp=bdee3fec00ae58168477a0bb2b6347e041b2a208;hb=b09850fb2c28c23547fed5ac83faf0fa2d3e6b8b;hpb=370510d04a5e22140e1e7f90f5d1f0002e6dbee6

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index bdee3fe..ab0d9a1 100644
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -96,7 +96,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 			return false;
 		}
 
-		if (darg->layout) {
+		if (darg->layout && darg->layout->len) {
 			pos = darg->layout->pos;
 			align = psi_decl_arg_align(darg, &pos, &len);
 
@@ -115,13 +115,53 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 			}
 		} else {
 			if (i) {
-				pos = prev_arg->layout->pos + prev_arg->layout->len;
+				if (prev_arg->layout->bfw && darg->layout->bfw) {
+					struct psi_decl_type *real = NULL;
+					size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
+
+					switch (real->type) {
+					case PSI_T_INT8:
+					case PSI_T_UINT8:
+					case PSI_T_INT16:
+					case PSI_T_UINT16:
+					case PSI_T_INT32:
+					case PSI_T_UINT32:
+					case PSI_T_INT64:
+					case PSI_T_UINT64:
+						break;
+					default:
+						data->error(data, darg->token, PSI_WARNING,
+								"Unsupported type for bit field: %s", real->name);
+						return false;
+					}
+					darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
+					if (max_bfw >= darg->layout->bfw->pos + darg->layout->bfw->len) {
+						pos = prev_arg->layout->pos;
+					} else {
+						darg->layout->bfw->pos = 0;
+						pos = prev_arg->layout->pos + prev_arg->layout->len;
+					}
+				} else {
+					pos = prev_arg->layout->pos + prev_arg->layout->len;
+				}
 			} else {
 				pos = 0;
 			}
 
 			align = psi_decl_arg_align(darg, &pos, &len);
-			darg->layout = psi_layout_init(pos, len);
+
+			if (darg->layout) {
+				if (darg->layout->pos != pos) {
+					data->error(data, darg->token, PSI_WARNING,
+							"Computed offset %zu of %s.%s does not match"
+							" pre-defined offset %zu",
+							pos, s->name, darg->var->name, darg->layout->pos);
+				}
+				darg->layout->pos = pos;
+				darg->layout->len = len;
+			} else {
+				darg->layout = psi_layout_init(pos, len, NULL);
+			}
 		}
 
 		if (align > s->align) {