wip

Author: clonker

libyul/CMakeLists.txt

@@ -69,8 +69,6 @@ add_library(yul
 	backends/evm/OptimizedEVMCodeTransform.cpp
 	backends/evm/OptimizedEVMCodeTransform.h
 	backends/evm/SSACFGStackShuffler.h
-	backends/evm/SSACFGStack.cpp
-	backends/evm/SSACFGStack.h
 	backends/evm/SSACFGStackLayout.cpp
 	backends/evm/SSACFGStackLayout.h
 	backends/evm/SSACFGEVMCodeTransform.cpp
@@ -93,6 +91,7 @@ add_library(yul
 	backends/evm/ssa/SSACFG.h
 	backends/evm/ssa/SSACFGBuilder.cpp
 	backends/evm/ssa/Stack.h
+	backends/evm/ssa/Stack.cpp
 	backends/evm/ssa/SSACFGBuilder.h
 	backends/evm/ssa/SSACFGJsonExporter.h
 	backends/evm/ssa/SSACFGJsonExporter.cpp

libyul/backends/evm/SSACFGStackLayout.h

@@ -19,8 +19,8 @@
 #pragma once
 
 #include <libyul/backends/evm/AbstractAssembly.h>
-#include <libyul/backends/evm/SSACFGStack.h>
 #include <libyul/backends/evm/ssa/SSACFG.h>
+#include <libyul/backends/evm/ssa/Stack.h>
 
 #include <libyul/Exceptions.h>
 
@@ -36,20 +36,15 @@ namespace solidity::yul::ssa
 
 struct SSACFGStackLayout
 {
-	// each operation has a current stack
-	using Stack = StackData;
-	// a slot can be some valueId or a labelId
-	using Slot = Stack::value_type;
-
 	// Each block has its own layout
 	struct BlockLayout
 	{
 		// stack layout required to enter the block
-		Stack stackIn;
+		StackData stackIn;
 		// stack layout required to execute the i-th operation in the block
-		std::vector<Stack> operationIn;
+		std::vector<StackSlot> operationIn;
 		// stack after the block was executed
-		Stack stackOut;
+		StackData stackOut;
 	};
 
 	// each block has a fixed list of operations

libyul/backends/evm/ssa/Stack.cpp

@@ -0,0 +1,80 @@
+#include "fmt/ranges.h"
+#include "range/v3/view/drop.hpp"
+
+
+#include <libyul/backends/evm/ssa/Stack.h>
+
+namespace
+{
+size_t junkTailSize(solidity::yul::ssa::Stack<>::Data const& _stackData)
+{
+	std::size_t numJunk = 0;
+	auto it = _stackData.begin();
+	while (it != _stackData.end() && it->isJunk())
+	{
+		++numJunk;
+		++it;
+	}
+	return numJunk;
+}
+}
+
+namespace solidity::yul::ssa
+{
+
+std::string slotToString(StackSlot const& _slot)
+{
+	switch (_slot.kind())
+	{
+	case StackSlot::Kind::ValueID:
+		return fmt::format("v{}", _slot.valueID().value);
+	case StackSlot::Kind::Junk:
+		return "JUNK";
+	case StackSlot::Kind::AssemblyLabelID:
+		return fmt::format("LABEL[{}]", _slot.assemblyLabelID());
+	case StackSlot::Kind::FunctionReturnLabel:
+		return fmt::format("ReturnLabel[ix={}]", _slot.functionReturnLabelIndex());
+	}
+}
+
+std::string slotToString(StackSlot const& _slot, SSACFG const& _cfg)
+{
+	if (_slot.kind() == StackSlot::Kind::ValueID)
+		return _cfg.valueDescription(_slot.valueID());
+
+	return slotToString(_slot);
+}
+
+std::string stackToString(Stack<>::Data const& _stackData)
+{
+	auto const numJunk = junkTailSize(_stackData);
+	if (numJunk > 0)
+		return fmt::format(
+			"[JUNK x {}, {}]",
+			numJunk,
+			fmt::join(_stackData | ranges::views::drop(numJunk) | ranges::views::transform([&](auto const& _slot) { return slotToString(_slot); }), ", ")
+		);
+
+	return format(
+		"[{}]",
+		fmt::join(_stackData | ranges::views::transform([&](auto const& _slot) { return slotToString(_slot); }), ", ")
+	);
+}
+
+std::string stackToString(Stack<>::Data const& _stackData, SSACFG const& _cfg)
+{
+	auto const numJunk = junkTailSize(_stackData);
+	if (numJunk > 0)
+		return format(
+			"[JUNK x {}, {}]",
+			numJunk,
+			fmt::join(_stackData | ranges::views::drop(numJunk) | ranges::views::transform([&](auto const& _slot) { return slotToString(_slot, _cfg); }), ", ")
+		);
+
+	return format(
+		"[{}]",
+		fmt::join(_stackData | ranges::views::transform([&](auto const& _slot) { return slotToString(_slot, _cfg); }), ", ")
+	);
+}
+
+}