Switch to 1-based indexing.

Author: ekpyron

libevmasm/Assembly.cpp

@@ -772,12 +772,12 @@ AssemblyItem Assembly::newAuxDataLoadN(size_t _offset)
 	return AssemblyItem{AuxDataLoadN, _offset};
 }
 
-AssemblyItem Assembly::newSwapN(uint8_t _depth)
+AssemblyItem Assembly::newSwapN(size_t _depth)
 {
 	return AssemblyItem::swapn(_depth);
 }
 
-AssemblyItem Assembly::newDupN(uint8_t _depth)
+AssemblyItem Assembly::newDupN(size_t _depth)
 {
 	return AssemblyItem::dupn(_depth);
 }
@@ -1648,13 +1648,13 @@ LinkerObject const& Assembly::assembleEOF() const
 				break;
 			case SwapN:
 				ret.bytecode.push_back(static_cast<uint8_t>(Instruction::SWAPN));
-				solAssert(item.data() < 256);
-				ret.bytecode.push_back(static_cast<uint8_t>(item.data()));
+				solAssert(item.data() >= 1 && item.data() <= 256);
+				ret.bytecode.push_back(static_cast<uint8_t>(item.data() - 1));
 				break;
 			case DupN:
 				ret.bytecode.push_back(static_cast<uint8_t>(Instruction::DUPN));
-				solAssert(item.data() < 256);
-				ret.bytecode.push_back(static_cast<uint8_t>(item.data()));
+				solAssert(item.data() >= 1 && item.data() <= 256);
+				ret.bytecode.push_back(static_cast<uint8_t>(item.data() - 1));
 				break;
 			default:
 				solAssert(false, "Unexpected opcode while assembling.");

libevmasm/Assembly.h

@@ -89,8 +89,8 @@ class Assembly
 	AssemblyItem newPushImmutable(std::string const& _identifier);
 	AssemblyItem newImmutableAssignment(std::string const& _identifier);
 	AssemblyItem newAuxDataLoadN(size_t offset);
-	AssemblyItem newSwapN(uint8_t _depth);
-	AssemblyItem newDupN(uint8_t _depth);
+	AssemblyItem newSwapN(size_t _depth);
+	AssemblyItem newDupN(size_t _depth);
 
 	AssemblyItem const& append(AssemblyItem _i);
 	AssemblyItem const& append(bytes const& _data) { return append(newData(_data)); }
@@ -104,8 +104,8 @@ class Assembly
 	void appendImmutable(std::string const& _identifier) { append(newPushImmutable(_identifier)); }
 	void appendImmutableAssignment(std::string const& _identifier) { append(newImmutableAssignment(_identifier)); }
 	void appendAuxDataLoadN(uint16_t _offset) { append(newAuxDataLoadN(_offset));}
-	void appendSwapN(uint8_t _depth) { append(newSwapN(_depth)); }
-	void appendDupN(uint8_t _depth) { append(newDupN(_depth)); }
+	void appendSwapN(size_t _depth) { append(newSwapN(_depth)); }
+	void appendDupN(size_t _depth) { append(newDupN(_depth)); }
 
 	void appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables)
 	{

libevmasm/AssemblyItem.cpp

@@ -212,9 +212,9 @@ size_t AssemblyItem::arguments() const
 	if (type() == CallF || type() == JumpF)
 		return functionSignature().argsNum;
 	else if (type() == SwapN)
-		return static_cast<size_t>(data()) + 2;
-	else if (type() == DupN)
 		return static_cast<size_t>(data()) + 1;
+	else if (type() == DupN)
+		return static_cast<size_t>(data());
 	else if (hasInstruction())
 	{
 		solAssert(instruction() != Instruction::CALLF && instruction() != Instruction::JUMPF);
@@ -245,7 +245,7 @@ size_t AssemblyItem::returnValues() const
 		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).ret);
 	case SwapN:
 	case DupN:
-		return static_cast<size_t>(data()) + 2;
+		return static_cast<size_t>(data()) + 1;
 	case Push:
 	case PushTag:
 	case PushData:

libevmasm/AssemblyItem.h

@@ -149,11 +149,11 @@ class AssemblyItem
 		solAssert(_tag.type() == Tag);
 		return AssemblyItem(ConditionalRelativeJump, Instruction::RJUMPI, _tag.data(), _debugData);
 	}
-	static AssemblyItem swapn(uint8_t _depth, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create())
+	static AssemblyItem swapn(size_t _depth, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create())
 	{
 		return AssemblyItem(SwapN, Instruction::SWAPN, _depth, _debugData);
 	}
-	static AssemblyItem dupn(uint8_t _depth, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create())
+	static AssemblyItem dupn(size_t _depth, langutil::DebugData::ConstPtr _debugData = langutil::DebugData::create())
 	{
 		return AssemblyItem(DupN, Instruction::DUPN, _depth, _debugData);
 	}

libyul/backends/evm/AbstractAssembly.h

@@ -149,8 +149,8 @@ class AbstractAssembly
 	/// EOF auxiliary data in data section and the auxiliary data are different things.
 	virtual void appendToAuxiliaryData(bytes const& _data) = 0;
 
-	virtual void appendSwapN(uint8_t _depth) = 0;
-	virtual void appendDupN(uint8_t _depth) = 0;
+	virtual void appendSwapN(size_t _depth) = 0;
+	virtual void appendDupN(size_t _depth) = 0;
 
 	/// Mark this assembly as invalid. Any attempt to request bytecode from it should throw.
 	virtual void markAsInvalid() = 0;

libyul/backends/evm/EthAssemblyAdapter.cpp

@@ -232,12 +232,12 @@ void EthAssemblyAdapter::appendAuxDataLoadN(uint16_t _offset)
 	m_assembly.appendAuxDataLoadN(_offset);
 }
 
-void EthAssemblyAdapter::appendSwapN(uint8_t _depth)
+void EthAssemblyAdapter::appendSwapN(size_t _depth)
 {
 	m_assembly.appendSwapN(_depth);
 }
 
-void EthAssemblyAdapter::appendDupN(uint8_t _depth)
+void EthAssemblyAdapter::appendDupN(size_t _depth)
 {
 	m_assembly.appendDupN(_depth);
 }

libyul/backends/evm/EthAssemblyAdapter.h

@@ -74,8 +74,8 @@ class EthAssemblyAdapter: public AbstractAssembly
 
 	void appendAuxDataLoadN(uint16_t _offset) override;
 
-	void appendSwapN(uint8_t _depth) override;
-	void appendDupN(uint8_t _depth) override;
+	void appendSwapN(size_t _depth) override;
+	void appendDupN(size_t _depth) override;
 
 	void markAsInvalid() override;
 

libyul/backends/evm/NoOutputAssembly.cpp

@@ -114,7 +114,7 @@ void NoOutputAssembly::appendAssemblySize()
 	appendInstruction(evmasm::Instruction::PUSH1);
 }
 
-void NoOutputAssembly::appendDupN(uint8_t)
+void NoOutputAssembly::appendDupN(size_t)
 {
 	m_stackHeight++;
 }

libyul/backends/evm/NoOutputAssembly.h

@@ -90,8 +90,8 @@ class NoOutputAssembly: public AbstractAssembly
 	void appendAuxDataLoadN(uint16_t) override;
 	void appendEOFCreate(ContainerID) override;
 	void appendReturnContract(ContainerID) override;
-	void appendSwapN(uint8_t) override {}
-	void appendDupN(uint8_t) override;
+	void appendSwapN(size_t) override {}
+	void appendDupN(size_t) override;
 
 	void markAsInvalid() override {}