rusty-gd: take vector sizes into account

Bug: 171749953
Tag: #gd-refactor
Test: gd/cert/run --rhost
Change-Id: I6705aa1924d927a51c8bced0eea7c0f105a2c1bc

diff --git a/gd/packet/parser/packet_def.cc b/gd/packet/parser/packet_def.cc
index d3bf525..97ce7ba 100644 (file)
--- a/gd/packet/parser/packet_def.cc
+++ b/gd/packet/parser/packet_def.cc
@@ -866,21 +866,6 @@ void PacketDef::GenRustStructFieldNames(std::ostream& s) const {
   }
 }
 
-void PacketDef::GenRustStructSizeField(std::ostream& s) const {
-  int size = 0;
-  auto fields = fields_.GetFieldsWithoutTypes({
-      BodyField::kFieldType,
-      CountField::kFieldType,
-  });
-  for (int i = 0; i < fields.size(); i++) {
-    size += fields[i]->GetSize().bits();
-  }
-  if (size % 8 != 0) {
-    ERROR() << "Packet size is not a multiple of 8!\n";
-  }
-  s << size / 8;
-}
-
 void PacketDef::GenRustStructImpls(std::ostream& s) const {
   s << "impl " << name_ << "Data {";
 
@@ -1026,8 +1011,8 @@ void PacketDef::GenRustStructImpls(std::ostream& s) const {
   }
   s << "}\n";
 
-  s << "pub fn get_size(&self) -> usize {";
-  GenRustStructSizeField(s);
+  s << "fn get_size(&self) -> usize {";
+  GenSizeRetVal(s);
   s << "}\n";
   s << "}\n";
 }

diff --git a/gd/packet/parser/packet_def.h b/gd/packet/parser/packet_def.h
index d8a4c5c..ec2bcb4 100644 (file)
--- a/gd/packet/parser/packet_def.h
+++ b/gd/packet/parser/packet_def.h
@@ -73,8 +73,6 @@ class PacketDef : public ParentDef {
 
   void GenRustStructFieldNames(std::ostream& s) const;
 
-  void GenRustStructSizeField(std::ostream& s) const;
-
   void GenRustStructImpls(std::ostream& s) const;
 
   void GenRustAccessStructImpls(std::ostream& s) const;

diff --git a/gd/packet/parser/parent_def.cc b/gd/packet/parser/parent_def.cc
index 402b257..04bb3d9 100644 (file)
--- a/gd/packet/parser/parent_def.cc
+++ b/gd/packet/parser/parent_def.cc
@@ -609,7 +609,8 @@ void ParentDef::GenRustWriteToFields(std::ostream& s) const {
         const auto& vector_name = field_name + "_bytes";
         const VectorField* vector = (VectorField*)sized_field;
         if (vector->element_size_.empty() || vector->element_size_.has_dynamic()) {
-          s << "let " << vector_name + " = self." << field_name << ".iter().fold(0, |acc, x| acc + x.get_size());";
+          s << "let " << vector_name + " = self." << field_name
+            << ".iter().fold(0, |acc, x| acc + x.get_total_size());";
         } else {
           s << "let " << vector_name + " = self." << field_name << ".len() * ((" << vector->element_size_ << ") / 8);";
         }
@@ -628,3 +629,30 @@ void ParentDef::GenRustWriteToFields(std::ostream& s) const {
     field->GenRustWriter(s, start_field_offset, end_field_offset);
   }
 }
+
+void ParentDef::GenSizeRetVal(std::ostream& s) const {
+  int size = 0;
+  auto fields = fields_.GetFieldsWithoutTypes({
+      BodyField::kFieldType,
+      CountField::kFieldType,
+  });
+  for (int i = 0; i < fields.size(); i++) {
+    size += fields[i]->GetSize().bits();
+  }
+  if (size % 8 != 0) {
+    ERROR() << "size is not a multiple of 8!\n";
+  }
+  s << size / 8;
+
+  fields = fields_.GetFieldsWithTypes({
+      VectorField::kFieldType,
+  });
+  for (int i = 0; i < fields.size(); i++) {
+    const VectorField* vector = (VectorField*)fields[i];
+    if (vector->element_size_.empty() || vector->element_size_.has_dynamic()) {
+      s << " + self." << vector->GetName() << ".iter().fold(0, |acc, x| acc + x.get_total_size())";
+    } else {
+      s << " + (self." << vector->GetName() << ".len() * ((" << vector->element_size_ << ") / 8))";
+    }
+  }
+}

diff --git a/gd/packet/parser/parent_def.h b/gd/packet/parser/parent_def.h
index 8b0a7f1..2e923a4 100644 (file)
--- a/gd/packet/parser/parent_def.h
+++ b/gd/packet/parser/parent_def.h
@@ -89,4 +89,6 @@ class ParentDef : public TypeDef {
   bool HasChildEnums() const;
 
   void GenRustWriteToFields(std::ostream& s) const;
+
+  void GenSizeRetVal(std::ostream& s) const;
 };

diff --git a/gd/packet/parser/struct_def.cc b/gd/packet/parser/struct_def.cc
index 12288ab..53bb816 100644 (file)
--- a/gd/packet/parser/struct_def.cc
+++ b/gd/packet/parser/struct_def.cc
@@ -342,21 +342,6 @@ void StructDef::GenRustFieldNames(std::ostream& s) const {
   }
 }
 
-void StructDef::GenRustSizeField(std::ostream& s) const {
-  int size = 0;
-  auto fields = fields_.GetFieldsWithoutTypes({
-      BodyField::kFieldType,
-      CountField::kFieldType,
-      SizeField::kFieldType,
-  });
-  for (const auto& field : fields) {
-    size += field->GetSize().bytes();
-  }
-  if (fields.size() > 0) {
-    s << size;
-  }
-}
-
 void StructDef::GenRustDeclarations(std::ostream& s) const {
   s << "#[derive(Debug, Clone)] ";
   s << "pub struct " << name_ << "{";
@@ -421,11 +406,9 @@ void StructDef::GenRustImpls(std::ostream& s) const {
   GenRustWriteToFields(s);
   s << "}\n";
 
-  if (fields.size() > 0) {
-    s << "pub fn get_size(&self) -> usize {";
-    GenRustSizeField(s);
-    s << "}";
-  }
+  s << "fn get_total_size(&self) -> usize {";
+  GenSizeRetVal(s);
+  s << "}";
   s << "}\n";
 }
 

diff --git a/gd/packet/parser/struct_def.h b/gd/packet/parser/struct_def.h
index 3f91004..6008d2b 100644 (file)
--- a/gd/packet/parser/struct_def.h
+++ b/gd/packet/parser/struct_def.h
@@ -58,8 +58,6 @@ class StructDef : public ParentDef {
 
   void GenRustFieldNames(std::ostream& s) const;
 
-  void GenRustSizeField(std::ostream& s) const;
-
   void GenRustDef(std::ostream& s) const;
 
  private: