Deleted aux data containers and added version field

xorpse · Feb 24, 2020 · 2d8ffd5 · 2d8ffd5
1 parent 7a40419
commit 2d8ffd5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/proto/AuxDataContainer.proto b/proto/AuxDataContainer.proto
diff --git a/proto/IR.proto b/proto/IR.proto
@@ -15,11 +15,19 @@
 syntax = "proto3";
 package proto;
 
-import "AuxDataContainer.proto";
+import "AuxData.proto";
 import "Module.proto";
 
 message IR {
+    // slot 4 has been used for multiple fields in the past
+    // (more specifically, main_module_id and aux_data_container),
+    // which is a Protobuf compatibility violation, but explains why we
+    // reserve more field names than field numbers.
+    reserved "tables", "main_module_id", "aux_data_container";
+    reserved 2, 4;
+
     bytes uuid = 1;
     repeated Module modules = 3;
-    AuxDataContainer aux_data_container = 4;
+    map<string, AuxData> aux_data = 5;
+    int32 version = 6;
 }
diff --git a/proto/Module.proto b/proto/Module.proto
@@ -15,7 +15,7 @@
 syntax = "proto3";
 package proto;
 
-import "AuxDataContainer.proto";
+import "AuxData.proto";
 import "Block.proto";
 import "CFG.proto";
 import "DataObject.proto";
@@ -47,6 +47,9 @@ enum ISAID {
 };
 
 message Module {
+    reserved "aux_data_container";
+    reserved 14;
+
     bytes uuid = 1;
     string binary_path = 2;
     uint64 preferred_addr = 3;
@@ -62,5 +65,5 @@ message Module {
     repeated ProxyBlock proxies = 16;
     repeated Section sections = 12;
     map<uint64, SymbolicExpression> symbolic_operands = 13;
-    AuxDataContainer aux_data_container = 14;
+    map<string, AuxData> aux_data = 17;
 }