Fixing opcode count

lisa-analyzer · Feb 26, 2024 · d397d1e · d397d1e
1 parent 4a6c1da
commit d397d1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/it/unipr/EVMLiSA.java b/src/main/java/it/unipr/EVMLiSA.java
@@ -196,7 +196,7 @@ else if (dumpAnalysis.equals("html"))
 
 			String msg2 = "\nResults \n" +
 					"Address: " + addressSC + "\n" +
-					"Opcodes: " + baseCfg.getNodesCount() + "\n" +
+					"Opcodes: " + baseCfg.getOpcodeCount() + "\n" +
 					"Jumps: " + baseCfg.getAllJumps().size() + "\n" +
 					"PreciselyResolvedJumps: " + pair.getLeft() + "\n" +
 					"SoundResolvedJumps: " + pair.getMiddle() + "\n" +
@@ -210,7 +210,7 @@ else if (dumpAnalysis.equals("html"))
 			if (dumpStatistics) {
 				String msg = MyLogger.newLogger()
 						.address(addressSC)
-						.opcodes(baseCfg.getNodesCount())
+						.opcodes(baseCfg.getOpcodeCount())
 						.jumps(baseCfg.getAllJumps().size())
 						.preciselyResolvedJumps(pair.getLeft())
 						.soundResolvedJumps(pair.getMiddle())
@@ -292,7 +292,7 @@ else if (!cfg.reachableFrom(entryPoint, jumpNode))
 			}
 
 		System.err.println("##############");
-		System.err.println("Total opcodes: " + cfg.getNodesCount());
+		System.err.println("Total opcodes: " + cfg.getOpcodeCount());
 		System.err.println("Total jumps: " + cfg.getAllJumps().size());
 		System.err.println("Precisely solved jumps: " + preciselyResolvedJumps);
 		System.err.println("Sound solved jumps: " + soundResolvedJumps);

diff --git a/src/main/java/it/unipr/cfg/EVMCFG.java b/src/main/java/it/unipr/cfg/EVMCFG.java
@@ -88,6 +88,11 @@ public Set<Statement> getAllJumps() {
 
 		return jumpNodes;
 	}
+
+	public int getOpcodeCount() {
+		// -1 for the return statement
+		return this.getNodesCount() - 1;
+	}
 
 	public <A extends AbstractState<A, H, V, T>,
 			H extends HeapDomain<H>,