Merge pull request #1660 from ethereum/asm-selfdestruct

Rename SUICIDE opcode to SELFDESTRUCT in libevmasm

8 files changed, 11 insertions, 11 deletions

diff --git a/libevmasm/EVMSchedule.h b/libevmasm/EVMSchedule.h
index f882f006..ce9003bd 100644
--- a/libevmasm/EVMSchedule.h
+++ b/libevmasm/EVMSchedule.h
@@ -47,7 +47,7 @@ struct EVMSchedule
 	unsigned callStipend = 2300;
 	unsigned callValueTransferGas = 9000;
 	unsigned callNewAccountGas = 25000;
-	unsigned suicideRefundGas = 24000;
+	unsigned selfdestructRefundGas = 24000;
 	unsigned memoryGas = 3;
 	unsigned quadCoeffDiv = 512;
 	unsigned createDataGas = 200;
diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
index 0bc10f1f..8ade838a 100644
--- a/libevmasm/GasMeter.h
+++ b/libevmasm/GasMeter.h
@@ -61,7 +61,7 @@ namespace GasCosts
 	static unsigned const callStipend = 2300;
 	static unsigned const callValueTransferGas = 9000;
 	static unsigned const callNewAccountGas = 25000;
-	static unsigned const suicideRefundGas = 24000;
+	static unsigned const selfdestructRefundGas = 24000;
 	static unsigned const memoryGas = 3;
 	static unsigned const quadCoeffDiv = 512;
 	static unsigned const createDataGas = 200;
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index b0f063da..f9ee9be1 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -160,7 +160,7 @@ const std::map<std::string, Instruction> dev::solidity::c_instructions =
 	{ "RETURN", Instruction::RETURN },
 	{ "DELEGATECALL", Instruction::DELEGATECALL },
 	{ "INVALID", Instruction::INVALID },
-	{ "SUICIDE", Instruction::SUICIDE }
+	{ "SELFDESTRUCT", Instruction::SELFDESTRUCT }
 };
 
 static const std::map<Instruction, InstructionInfo> c_instructionInfo =
@@ -293,9 +293,9 @@ static const std::map<Instruction, InstructionInfo> c_instructionInfo =
 	{ Instruction::CALL,		{ "CALL",			0, 7, 1, true, Tier::Special } },
 	{ Instruction::CALLCODE,	{ "CALLCODE",		0, 7, 1, true, Tier::Special } },
 	{ Instruction::RETURN,		{ "RETURN",			0, 2, 0, true, Tier::Zero } },
-	{ Instruction::DELEGATECALL,{ "DELEGATECALL",	0, 6, 1, true, Tier::Special } },
+	{ Instruction::DELEGATECALL,	{ "DELEGATECALL",	0, 6, 1, true, Tier::Special } },
 	{ Instruction::INVALID,		{ "INVALID",		0, 0, 0, true, Tier::Zero } },
-	{ Instruction::SUICIDE,		{ "SUICIDE",		0, 1, 0, true, Tier::Zero } }
+	{ Instruction::SELFDESTRUCT,	{ "SELFDESTRUCT",		0, 1, 0, true, Tier::Zero } }
 };
 
 void dev::solidity::eachInstruction(
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index be71a499..7f56ad3a 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -178,7 +178,7 @@ enum class Instruction: uint8_t
 	DELEGATECALL,		///< like CALLCODE but keeps caller's value and sender
 
 	INVALID = 0xfe,		///< invalid instruction for expressing runtime errors (e.g., division-by-zero)
-	SUICIDE = 0xff		///< halt execution and register account for later deletion
+	SELFDESTRUCT = 0xff	///< halt execution and register account for later deletion
 };
 
 /// @returns the number of PUSH Instruction _inst
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 528ce1c4..9a8341ab 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -200,7 +200,7 @@ struct UnreachableCode
 			it[0] != Instruction::RETURN &&
 			it[0] != Instruction::STOP &&
 			it[0] != Instruction::INVALID &&
-			it[0] != Instruction::SUICIDE
+			it[0] != Instruction::SELFDESTRUCT
 		)
 			return false;
 
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index d3ce4735..3a0843b8 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -116,7 +116,7 @@ bool SemanticInformation::altersControlFlow(AssemblyItem const& _item)
 	case Instruction::JUMP:
 	case Instruction::JUMPI:
 	case Instruction::RETURN:
-	case Instruction::SUICIDE:
+	case Instruction::SELFDESTRUCT:
 	case Instruction::STOP:
 	case Instruction::INVALID:
 		return true;
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index b66a3e12..d74d9dd3 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -648,7 +648,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case Location::Selfdestruct:
 			arguments.front()->accept(*this);
 			utils().convertType(*arguments.front()->annotation().type, *function.parameterTypes().front(), true);
-			m_context << Instruction::SUICIDE;
+			m_context << Instruction::SELFDESTRUCT;
 			break;
 		case Location::SHA3:
 		{
diff --git a/libsolidity/inlineasm/AsmParser.cpp b/libsolidity/inlineasm/AsmParser.cpp
index fcc92dbb..46a2730d 100644
--- a/libsolidity/inlineasm/AsmParser.cpp
+++ b/libsolidity/inlineasm/AsmParser.cpp
@@ -152,8 +152,8 @@ std::map<string, dev::solidity::Instruction> const& Parser::instructions()
 			s_instructions[name] = instruction.second;
 		}
 
-		// add alias for selfdestruct
-		s_instructions["selfdestruct"] = solidity::Instruction::SUICIDE;
+		// add alias for suicide
+		s_instructions["suicide"] = solidity::Instruction::SELFDESTRUCT;
 	}
 	return s_instructions;
 }