I haven't tested this at all, but this may fix backwards compatibility
in inst.proto by removing the oneof construct.
Change-Id: Iba19744791c2c577c3b442402f8cc6dcef8550bd
Reviewed-on: https://gem5-review.googlesource.com/9361
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
message Inst {
required uint64 pc = 1;
- oneof inst_oneof {
- fixed32 inst = 2;
- bytes inst_bytes = 9;
- }
+
+ // Either inst or inst_bytes must be used, but never both. That should be
+ // enforced by the oneof keyword, but that's not supported in all versions
+ // of protobuf syntax we need to work with for now.
+ optional fixed32 inst = 2;
+ optional bytes inst_bytes = 9;
+
optional uint32 nodeid = 3;
optional uint32 cpuid = 4;
optional fixed64 tick = 5;