X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fproto%2Finst.proto;h=ef44dfe43c7ad3bef20cbd0bf296f969fd1e5843;hb=7ff32d7b53b1a699f4383d3c9c5279b6ab894d55;hp=3e8dcde8ba70ab2ba1a9c29dcbf90d7f22131081;hpb=4eff4fa12eafbf6337fdf9a23668880ad55aad9c;p=gem5.git

diff --git a/src/proto/inst.proto b/src/proto/inst.proto
index 3e8dcde8b..ef44dfe43 100644
--- a/src/proto/inst.proto
+++ b/src/proto/inst.proto
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 ARM Limited
+// Copyright (c) 2014,2017 ARM Limited
 // All rights reserved
 //
 // The license below extends only to copyright in the software and shall
@@ -35,6 +35,7 @@
 //
 // Authors: Ali Saidi
 
+syntax = "proto2";
 
 // Put all the generated messages in a namespace
 package ProtoMessage;
@@ -51,7 +52,13 @@ message InstHeader {
 
 message Inst {
   required uint64 pc = 1;
-  required fixed32 inst = 2;
+
+  // 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;
@@ -94,6 +101,8 @@ message Inst {
   }
 
   optional InstType type = 6; // add, mul, fp add, load, store, simd add, …
+
+  // Deprecated:
   optional uint32 inst_flags = 7; // execution mode information
 
   // If the operation does one or more memory accesses