Move operand info generation to frame buffer

Author: Rot127

contrib/plugins/bap-tracing/frame_buffer.c

@@ -96,7 +96,12 @@ bool frame_buffer_new_frame_std(WLOCKED FrameBuffer *buf,
   return true;
 }
 
-bool frame_buffer_append_op_info(WLOCKED FrameBuffer *buf, OperandInfo *oi) {
+bool frame_buffer_append_reg_info(WLOCKED FrameBuffer *buf, const char *name,
+                                  const GByteArray *content,
+                                  OperandAccess acc) {
+  OperandInfo *rinfo =
+      frame_init_reg_operand_info(name, content->data, content->len, acc);
+  g_assert(rinfo);
   Frame *frame = buf->fbuf[buf->idx];
   if (!frame) {
     qemu_plugin_outs(
@@ -107,7 +112,8 @@ bool frame_buffer_append_op_info(WLOCKED FrameBuffer *buf, OperandInfo *oi) {
 }
 
 OperandInfo *frame_init_reg_operand_info(const char *name, const uint8_t *value,
-                                   size_t value_size, OperandAccess access) {
+                                         size_t value_size,
+                                         OperandAccess access) {
   RegOperand *ro = g_new(RegOperand, 1);
   reg_operand__init(ro);
   ro->name = strdup(name);

contrib/plugins/bap-tracing/frame_buffer.h

@@ -43,7 +43,9 @@ bool frame_buffer_new_frame_std(WLOCKED FrameBuffer *buf,
 /**
  * \brief Appends the given operand info to the open frame.
  */
-bool frame_buffer_append_op_info(WLOCKED FrameBuffer *buf, OperandInfo *oi);
+bool frame_buffer_append_reg_info(WLOCKED FrameBuffer *buf, const char *name,
+                                  const GByteArray *content,
+                                  OperandAccess acc);
 
 OperandInfo *frame_init_reg_operand_info(const char *name, const uint8_t *value,
                                          size_t value_size,

contrib/plugins/bap-tracing/tracing.c

@@ -14,23 +14,20 @@ static void log_insn_mem_access(unsigned int vcpu_index,
 
 static void add_post_reg_state(VCPU *vcpu, unsigned int vcpu_index,
                                GArray *current_regs, FrameBuffer *fbuf) {
-  GByteArray *rtmp = g_byte_array_new();
+  GByteArray *rdata = g_byte_array_new();
   for (size_t i = 0; i < current_regs->len; ++i) {
     Register *prev_reg = vcpu->registers->pdata[i];
 
     qemu_plugin_reg_descriptor *reg =
         &g_array_index(current_regs, qemu_plugin_reg_descriptor, i);
-    int s = qemu_plugin_read_register(reg->handle, rtmp);
+    int s = qemu_plugin_read_register(reg->handle, rdata);
     assert(s == prev_reg->content->len);
-    if (!memcmp(rtmp->data, prev_reg->content->data, s)) {
+    if (!memcmp(rdata->data, prev_reg->content->data, s)) {
       // No change
       continue;
     }
 
-    OperandInfo *rinfo = frame_init_reg_operand_info(prev_reg->name, rtmp->data,
-                                               rtmp->len, OperandWritten);
-    g_assert(rinfo);
-    if (!frame_buffer_append_op_info(fbuf, rinfo)) {
+    if (!frame_buffer_append_reg_info(fbuf, reg->name, rdata, OperandWritten)) {
       qemu_plugin_outs("Failed to append opinfo.\n");
       g_assert(false);
     }
@@ -39,15 +36,12 @@ static void add_post_reg_state(VCPU *vcpu, unsigned int vcpu_index,
 
 static void add_pre_reg_state(VCPU *vcpu, unsigned int vcpu_index,
                               GArray *current_regs, FrameBuffer *fbuf) {
-  GByteArray *rtmp = g_byte_array_new();
+  GByteArray *rdata = g_byte_array_new();
   for (size_t i = 0; i < current_regs->len; ++i) {
     qemu_plugin_reg_descriptor *reg =
         &g_array_index(current_regs, qemu_plugin_reg_descriptor, i);
-    qemu_plugin_read_register(reg->handle, rtmp);
-    OperandInfo *rinfo =
-        frame_init_reg_operand_info(reg->name, rtmp->data, rtmp->len, OperandRead);
-    g_assert(rinfo);
-    frame_buffer_append_op_info(fbuf, rinfo);
+    qemu_plugin_read_register(reg->handle, rdata);
+    frame_buffer_append_reg_info(fbuf, reg->name, rdata, OperandRead);
   }
 }