Colored opcodes in a loop in a different way

Author: fergarrui

src/api/bytecode/Operation.ts

@@ -6,4 +6,5 @@ export interface Operation {
   argument: any
   begin?: number
   end?: number
+  repeated?: number
 }

src/api/cfg/GraphVizService.ts

@@ -7,13 +7,16 @@ import { DebugTrace } from '../symbolic/evm/DebugTrace'
 @injectable()
 export class GraphVizService {
   createDotFromBlocks(blocks: CFGBlocks, trace: DebugTrace): string {
-    return `digraph " " {
+    let graph = `digraph " " {
       graph [splines=ortho ranksep="2" nodesep="2"]
       rankdir=LR
-      node [shape=plain fillcolor="#2A2A2A" style=filled fontname="Courier"]
-      ${this.createLegend()}
-      ${this.buildBody(blocks, trace)}
-    }`
+      node [shape=plain fillcolor="#2A2A2A" style=filled fontname="Courier"]`
+      if (trace) {
+        graph += `${this.createLegend()}`
+      }
+      graph += `${this.buildBody(blocks, trace)}
+        }`
+      return graph
   }
 
   private createLegend() {
@@ -46,6 +49,9 @@ export class GraphVizService {
       if (trace && this.isOperationInTrace(op, trace)) {
         fontColor = '#ff1020'
       }
+      if (op.repeated > 1) {
+        fontColor = '#CD950C'
+      }
       ops += `<TR>`
       ops += `<TD ID="${op.offset.toString(16)}" HREF=" "><font color="${fontColor}">0x${op.offset.toString(
         16

src/api/cfg/OperationBlock.ts

@@ -4,6 +4,5 @@ export interface OperationBlock {
   offset: number
   operations: Operation[]
   childA?: number
-  childB?: number,
-  repeated?: number
+  childB?: number
 }

src/api/service/service/CFGService.ts

@@ -51,13 +51,14 @@ export class CFGService {
   checkTraceLoops(blocks: CFGBlocks, trace: DebugTrace) {
     const logs = trace.result.structLogs
     const count = this.count(logs.map(l => l.pc))
-    const repeated: any = Object.keys(count).filter(key => count[key] > 1).map( key=> { return {offset: key, repeated: count[key]}})
+    const repeated: any = Object.keys(count).filter(key => count[key] > 1).map( key=> { return {offset:  parseInt(key), repeated: parseInt(count[key])}})
     for (const repeatedOffset of repeated) {
-      console.log(`trying to find block ${repeatedOffset.offset}`)
       const block = blocks.get(repeatedOffset.offset)
       if (block) {
-        console.log('block found')
-        block.repeated = repeatedOffset.repeated
+        const operation = block.operations.find(op => op.offset === parseInt(repeatedOffset.offset))
+        if (operation) {
+          operation.repeated = repeatedOffset.repeated
+        }
       }
     }
   }