derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpu: Proposed fix for backwards compatibility in proto/inst.proto.

Browse Source 
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>
This commit is contained in:
Gabe Black
2018-03-23 18:11:12 -07:00
parent 1148c9f2f3
commit 979b30ec8b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/proto/inst.proto
View File

@@ -52,10 +52,13 @@ message InstHeader {
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;